Bug 1284350 - Revert "Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me" on a CLOSED TREE. a=lizzard
authorSeth Fowler <mark.seth.fowler@gmail.com>
Fri, 08 Jul 2016 11:47:07 -0700
changeset 333605 aef05caef8b64d6ba6845724d5d844fdcbe16aae
parent 333604 23d50da987261085138dab3f05eae49806d9bf1b
child 333606 8a797d7d5d2d5ed4c97b6c06f2dc69972c94ebb6
push id6190
push usermfowler@mozilla.com
push dateFri, 08 Jul 2016 22:11:19 +0000
treeherdermozilla-beta@cbacbb7c2c35 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, lizzard
bugs1284350, 1261554
milestone48.0
Bug 1284350 - Revert "Bug 1261554 (Followup) - Fix memory reporting for PresShell::mVisibleRegions. r=me" on a CLOSED TREE. a=lizzard This reverts commit 8a3d17e5759542e3fb69f43e840d414286f519bf.
layout/base/nsPresShell.cpp
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -11070,18 +11070,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");