Bug 1584378. blob: Remove unused mImageBounds. r=nical
authorJeff Muizelaar <jrmuizel@gmail.com>
Wed, 02 Oct 2019 16:43:35 +0000
changeset 496101 3af30f4d00d98bc8d43122dc5c462258c59977d3
parent 496100 e2cfa8ce991523ad0ed9f8a523c09382d7988b64
child 496102 dc68121e7d8f50e59ce9b169bd0b7a3e9fdd23e7
push id97008
push userjmuizelaar@mozilla.com
push dateWed, 02 Oct 2019 18:09:12 +0000
treeherderautoland@3af30f4d00d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1584378
milestone71.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1584378. blob: Remove unused mImageBounds. r=nical We don't use this for the bounds of the blob anymore. Differential Revision: https://phabricator.services.mozilla.com/D47360
gfx/layers/wr/WebRenderCommandBuilder.cpp
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -303,19 +303,17 @@ struct DIGroup {
   // This is the intersection of mVisibleRect and mLastVisibleRect
   // we ensure that mInvalidRect is contained in mPreservedRect
   IntRect mPreservedRect;
   int32_t mAppUnitsPerDevPixel;
   gfx::Size mScale;
   ScrollableLayerGuid::ViewID mScrollId;
   LayerPoint mResidualOffset;
   LayerIntRect mLayerBounds; // mGroupBounds converted to Layer space
-  // The current bounds of the blob image
-  IntRect mImageBounds; // mLayerBounds in unknown units
-  // mImageBounds clipped to the container/parent of the
+  // mLayerBounds clipped to the container/parent of the
   // current item being processed.
   IntRect mClippedImageBounds; // mLayerBounds with the clipping of any containers applied
   Maybe<mozilla::Pair<wr::RenderRoot, wr::BlobImageKey>> mKey;
   std::vector<RefPtr<ScaledFont>> mFonts;
 
   DIGroup()
       : mAppUnitsPerDevPixel(0),
         mScrollId(ScrollableLayerGuid::NULL_SCROLL_ID) {}
@@ -1254,17 +1252,16 @@ void Grouper::ConstructGroups(nsDisplayL
         groupData->mFollowingGroup.ClearImageKey(
             aCommandBuilder->mManager->GetRenderRootStateManager(
                 aBuilder.GetRenderRoot()));
       }
       groupData->mFollowingGroup.mGroupBounds = currentGroup->mGroupBounds;
       groupData->mFollowingGroup.mAppUnitsPerDevPixel =
           currentGroup->mAppUnitsPerDevPixel;
       groupData->mFollowingGroup.mLayerBounds = currentGroup->mLayerBounds;
-      groupData->mFollowingGroup.mImageBounds = currentGroup->mImageBounds;
       groupData->mFollowingGroup.mClippedImageBounds =
           currentGroup->mClippedImageBounds;
       groupData->mFollowingGroup.mScale = currentGroup->mScale;
       groupData->mFollowingGroup.mResidualOffset =
           currentGroup->mResidualOffset;
       groupData->mFollowingGroup.mVisibleRect = currentGroup->mVisibleRect;
       groupData->mFollowingGroup.mPreservedRect =
         groupData->mFollowingGroup.mVisibleRect.Intersect(groupData->mFollowingGroup.mLastVisibleRect).ToUnknownRect();
@@ -1528,18 +1525,17 @@ void WebRenderCommandBuilder::DoGrouping
 
   g.mAppUnitsPerDevPixel = appUnitsPerDevPixel;
   group.mResidualOffset = residualOffset;
   group.mGroupBounds = groupBounds;
   group.mLayerBounds = layerBounds;
   group.mVisibleRect = visibleRect;
   group.mPreservedRect = group.mVisibleRect.Intersect(group.mLastVisibleRect).ToUnknownRect();
   group.mAppUnitsPerDevPixel = appUnitsPerDevPixel;
-  group.mImageBounds = layerBounds.ToUnknownRect();
-  group.mClippedImageBounds = group.mImageBounds;
+  group.mClippedImageBounds = layerBounds.ToUnknownRect();
 
   g.mTransform = Matrix::Scaling(scale.width, scale.height)
                      .PostTranslate(residualOffset.x, residualOffset.y);
   group.mScale = scale;
   group.mScrollId = scrollId;
   g.ConstructGroups(aDisplayListBuilder, this, aBuilder, aResources, &group,
                     aList, aSc);
   mCurrentClipManager->EndList(aSc);