Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 852489. Part 6: Don't temporarily reset clip when recycling Thebes/Image/ColorLayers. r=mattwoodrow

Browse Source 
--HG--
extra : rebase_source : 28ac0c65edef8d2f0de2e79003370520066508e7
This commit is contained in:
Robert O'Callahan 2013-03-22 15:17:29 +13:00
parent 303b2ed096
commit 1f73e74382
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/base/FrameLayerBuilder.cpp
View File

@ -1180,7 +1180,6 @@ ContainerState::CreateOrRecycleColorLayer(ThebesLayer *aThebes)
static_cast<ThebesDisplayItemLayerUserData*>(aThebes->GetUserData(&gThebesDisplayItemLayerUserData));
nsRefPtr<ColorLayer> layer = data->mColorLayer;
if (layer) {
layer->SetClipRect(nullptr);
layer->SetMaskLayer(nullptr);
} else {
// Create a new layer
@ -1204,7 +1203,6 @@ ContainerState::CreateOrRecycleImageLayer(ThebesLayer *aThebes)
static_cast<ThebesDisplayItemLayerUserData*>(aThebes->GetUserData(&gThebesDisplayItemLayerUserData));
nsRefPtr<ImageLayer> layer = data->mImageLayer;
if (layer) {
layer->SetClipRect(nullptr);
layer->SetMaskLayer(nullptr);
} else {
// Create a new layer
@ -1305,7 +1303,6 @@ ContainerState::CreateOrRecycleThebesLayer(const nsIFrame* aActiveScrolledRoot,
++mNextFreeRecycledThebesLayer;
// Clear clip rect and mask layer so we don't accidentally stay clipped.
// We will reapply any necessary clipping.
layer->SetClipRect(nullptr);
layer->SetMaskLayer(nullptr);
data = static_cast<ThebesDisplayItemLayerUserData*>
@ -1572,7 +1569,9 @@ ContainerState::PopThebesLayerData()
if (data->mItemClip.mHaveClipRect) {
nsIntRect clip = ScaleToNearestPixels(data->mItemClip.mClipRect);
clip.MoveBy(mParameters.mOffset);
imageLayer->IntersectClipRect(clip);
imageLayer->SetClipRect(&clip);
} else {
imageLayer->SetClipRect(nullptr);
}
layer = imageLayer;
mLayerBuilder->StoreOptimizedLayerForFrame(data->mImage,
@ -1606,11 +1605,13 @@ ContainerState::PopThebesLayerData()
// Hide the ThebesLayer. We leave it in the layer tree so that we
// can find and recycle it later.
data->mLayer->IntersectClipRect(nsIntRect());
nsIntRect emptyRect;
data->mLayer->SetClipRect(&emptyRect);
data->mLayer->SetVisibleRegion(nsIntRegion());
} else {
layer = data->mLayer;
imageContainer = nullptr;
layer->SetClipRect(nullptr);
}
gfxMatrix transform;