Bug 1284350 - Revert "Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me". a=lizzard
authorSeth Fowler <mark.seth.fowler@gmail.com>
Fri, 08 Jul 2016 18:33:04 -0700
changeset 341909 dac618c494598f39ea33728133110dd236c50d91
parent 341908 1bb133ce73f9bfbfc5f8ae0247ccfc24f40b3f27
child 341910 a99d44f34be9ec350d99d6fb177a16de2a550ce0
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, lizzard
bugs1284350, 1261554
milestone49.0a2
Bug 1284350 - Revert "Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me". a=lizzard This reverts commit 8a3d17e5759542e3fb69f43e840d414286f519bf.
layout/base/nsPresShell.cpp
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -11143,18 +11143,18 @@ PresShell::AddSizeOfIncludingThis(Malloc
   mFrameArena.AddSizeOfExcludingThis(aMallocSizeOf, aArenaObjectsSize);
   *aPresShellSize += aMallocSizeOf(this);
   if (mCaret) {
     *aPresShellSize += mCaret->SizeOfIncludingThis(aMallocSizeOf);
   }
   *aPresShellSize += mApproximatelyVisibleFrames.ShallowSizeOfExcludingThis(aMallocSizeOf);
   *aPresShellSize += mInDisplayPortFrames.ShallowSizeOfExcludingThis(aMallocSizeOf);
   *aPresShellSize += mVisibleRegions
-                   ? mVisibleRegions->mApproximate.ShallowSizeOfIncludingThis(aMallocSizeOf) +
-                     mVisibleRegions->mInDisplayPort.ShallowSizeOfIncludingThis(aMallocSizeOf)
+                   ? mVisibleRegions->mApproximate.ShallowSizeOfExcludingThis(aMallocSizeOf) +
+                     mVisibleRegions->mInDisplayPort.ShallowSizeOfExcludingThis(aMallocSizeOf)
                    : 0;
   *aPresShellSize += mFramesToDirty.ShallowSizeOfExcludingThis(aMallocSizeOf);
   *aPresShellSize += aArenaObjectsSize->mOther;
 
   if (nsStyleSet* styleSet = StyleSet()->GetAsGecko()) {
     *aStyleSetsSize += styleSet->SizeOfIncludingThis(aMallocSizeOf);
   } else {
     NS_WARNING("ServoStyleSets do not support memory measurements yet");