Bug 1224951 - Part 1: Fix nsPresContext::SizeOfExcludingThis() size calculation. r=dholbert
authorChris Peterson <cpeterson@mozilla.com>
Sat, 14 Nov 2015 00:06:58 -0800
changeset 273443 be237dc0a0b5d8b5b8c0c484bcf8c175970ff52e
parent 273442 239b9c7730ff03375ce75f36507ddcda757b0b57
child 273444 597c3c78da4aaeea391119a1d0887eff3baba6fe
push id68283
push usercpeterson@mozilla.com
push dateFri, 20 Nov 2015 06:07:33 +0000
treeherdermozilla-inbound@597c3c78da4a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1224951
milestone45.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 1224951 - Part 1: Fix nsPresContext::SizeOfExcludingThis() size calculation. r=dholbert
layout/base/nsPresContext.cpp
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -2848,21 +2848,20 @@ nsPresContext::GetPrimaryFrameFor(nsICon
   NS_PRECONDITION(aContent, "Don't do that");
   if (GetPresShell() &&
       GetPresShell()->GetDocument() == aContent->GetComposedDoc()) {
     return aContent->GetPrimaryFrame();
   }
   return nullptr;
 }
 
-
 size_t
 nsPresContext::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
-  return mPropertyTable.SizeOfExcludingThis(aMallocSizeOf);
+  return mPropertyTable.SizeOfExcludingThis(aMallocSizeOf) +
          mLangGroupFontPrefs.SizeOfExcludingThis(aMallocSizeOf);
 
   // Measurement of other members may be added later if DMD finds it is
   // worthwhile.
 }
 
 bool
 nsPresContext::IsRootContentDocument()