Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 782368; undo patch from 780868. r=mattwoodrow

Browse Source 
--HG--
extra : rebase_source : 6eb5a907d4e1eafa6bc7c6dd5d185c28a4c248be
This commit is contained in:
Nicholas Cameron 2012-12-12 10:57:52 +13:00
parent a239d2030b
commit 806bdcaa73
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/FrameLayerBuilder.cpp
View File

@ -3765,7 +3765,7 @@ ContainerState::SetupMaskLayer(Layer *aLayer, const FrameLayerBuilder::Clip& aCl
imageTransform.Scale(mParameters.mXScale, mParameters.mYScale);
nsAutoPtr<MaskLayerImageCache::MaskLayerImageKey> newKey(
new MaskLayerImageCache::MaskLayerImageKey(aLayer->Manager()->GetBackendType()));
new MaskLayerImageCache::MaskLayerImageKey());
// copy and transform the rounded rects
for (uint32_t i = 0; i < newData.mRoundedClipRects.Length(); ++i) {

10
layout/base/MaskLayerImageCache.h
View File

@ -130,16 +130,14 @@ public:
*/
struct MaskLayerImageKey
{
MaskLayerImageKey(layers::LayersBackend aBackend)
: mBackend(aBackend)
, mLayerCount(0)
MaskLayerImageKey()
: mLayerCount(0)
, mRoundedClipRects()
{
MOZ_COUNT_CTOR(MaskLayerImageKey);
}
MaskLayerImageKey(const MaskLayerImageKey& aKey)
: mBackend(aKey.mBackend)
, mLayerCount(aKey.mLayerCount)
: mLayerCount(aKey.mLayerCount)
, mRoundedClipRects(aKey.mRoundedClipRects)
{
MOZ_COUNT_CTOR(MaskLayerImageKey);
@ -164,7 +162,6 @@ public:
for (uint32_t i = 0; i < mRoundedClipRects.Length(); ++i) {
hash = AddToHash(hash, mRoundedClipRects[i].Hash());
}
hash = AddToHash(hash, mBackend);
return hash;
}
@ -174,7 +171,6 @@ public:
return mRoundedClipRects == aOther.mRoundedClipRects;
}
layers::LayersBackend mBackend;
mutable uint32_t mLayerCount;
nsTArray<PixelRoundedRect> mRoundedClipRects;
};