diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp index 3c46d7746490..1d06a98acb66 100644 --- a/gfx/layers/wr/WebRenderCommandBuilder.cpp +++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp @@ -295,12 +295,8 @@ struct DIGroup { IntRect mInvalidRect; nsRect mGroupBounds; LayerIntRect mVisibleRect; - // This is the last visible rect sent to WebRender. It's used - // to compute the invalid rect and ensure that we send - // the appropriate data to WebRender for merging. LayerIntRect mLastVisibleRect; - - // This is the intersection of mVisibleRect and mLastVisibleRect + // this is the intersection of mVisibleRect and mLastVisibleRect // we ensure that mInvalidRect is contained in mPreservedRect IntRect mPreservedRect; int32_t mAppUnitsPerDevPixel; @@ -634,7 +630,6 @@ struct DIGroup { mKey.value().second(), ViewAs(mVisibleRect, PixelCastJustification::LayerIsImage)); - mLastVisibleRect = mVisibleRect; PushImage(aBuilder, itemBounds); } return; @@ -746,7 +741,6 @@ struct DIGroup { aResources.SetBlobImageVisibleArea( mKey.value().second(), ViewAs(mVisibleRect, PixelCastJustification::LayerIsImage)); - mLastVisibleRect = mVisibleRect; PushImage(aBuilder, itemBounds); GP("End EndGroup\n\n"); } @@ -1530,6 +1524,7 @@ void WebRenderCommandBuilder::DoGroupingForDisplayList( group.mResidualOffset = residualOffset; group.mGroupBounds = groupBounds; group.mLayerBounds = layerBounds; + group.mLastVisibleRect = group.mVisibleRect; group.mVisibleRect = visibleRect; group.mPreservedRect = group.mVisibleRect.Intersect(group.mLastVisibleRect).ToUnknownRect(); group.mAppUnitsPerDevPixel = appUnitsPerDevPixel; diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list index 141a2ac2cbee..ba9d915c3314 100644 --- a/layout/svg/crashtests/crashtests.list +++ b/layout/svg/crashtests/crashtests.list @@ -230,4 +230,3 @@ load 1539318-1.svg load 1548985-1.html load 1548985-2.svg load 1555851.html -load invalidation-of-opacity-0.html diff --git a/layout/svg/crashtests/invalidation-of-opacity-0.html b/layout/svg/crashtests/invalidation-of-opacity-0.html deleted file mode 100644 index 50700e390808..000000000000 --- a/layout/svg/crashtests/invalidation-of-opacity-0.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - -