Bug 1284350. Backed out changeset a909de86c183 (Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me) a=ritu
authorTimothy Nikkel <tnikkel@gmail.com>
Thu, 15 Sep 2016 16:22:56 -0500
changeset 348170 8b20174940e3ebc9a498aea9d883d0052e0c79ca
parent 348169 8b6250fe6c982d79c96cbc4700e5e7b4bd04bf97
child 348171 c8394a948076771ee29634d134129e7532fe772b
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, ritu
bugs1284350, 1261554
milestone50.0a2
Bug 1284350. Backed out changeset a909de86c183 (Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me) a=ritu
layout/base/nsPresShell.cpp
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -11153,18 +11153,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");