Backed out changeset b88166b3b314 (bug 1542263) for 1401692.html perma failures a=backout
authorCiure Andrei <aciure@mozilla.com>
Mon, 08 Apr 2019 21:59:14 +0300
changeset 468402 40456af7da1ce0561a28bc88da23427fa56d3282
parent 468401 ad9d1c77d60b43669f4b61ba618cdf89cc855473
child 468403 facb0f655f03a8c3a9c02cec2dc7e607ebbc2514
push id35835
push useraciure@mozilla.com
push dateMon, 08 Apr 2019 19:00:29 +0000
treeherdermozilla-central@40456af7da1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1542263, 1401692
milestone68.0a1
backs outb88166b3b314cda6ea94a0444d116c6b0321b6bd
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
Backed out changeset b88166b3b314 (bug 1542263) for 1401692.html perma failures a=backout
dom/base/Document.cpp
layout/base/PresShell.cpp
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -11150,18 +11150,16 @@ void Document::DocAddSizeOfExcludingThis
   //
   // Therefore, the measurement of the Document superclass must happen after
   // the measurement of DOM nodes (above), because Document contains the
   // PresShell, which contains the frame tree.
   if (mPresShell) {
     mPresShell->AddSizeOfIncludingThis(aWindowSizes);
   }
 
-  mStyleSet->AddSizeOfIncludingThis(aWindowSizes);
-
   aWindowSizes.mDOMOtherSize += mLangGroupFontPrefs.SizeOfExcludingThis(
       aWindowSizes.mState.mMallocSizeOf);
 
   aWindowSizes.mPropertyTablesSize +=
       mPropertyTable.SizeOfExcludingThis(aWindowSizes.mState.mMallocSizeOf);
 
   if (EventListenerManager* elm = GetExistingListenerManager()) {
     aWindowSizes.mDOMEventListenersCount += elm->ListenerCount();
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -10554,16 +10554,18 @@ void PresShell::AddSizeOfIncludingThis(n
     aSizes.mLayoutPresShellSize += mCaret->SizeOfIncludingThis(mallocSizeOf);
   }
   aSizes.mLayoutPresShellSize +=
       mApproximatelyVisibleFrames.ShallowSizeOfExcludingThis(mallocSizeOf) +
       mFramesToDirty.ShallowSizeOfExcludingThis(mallocSizeOf) +
       mPendingScrollAnchorSelection.ShallowSizeOfExcludingThis(mallocSizeOf) +
       mPendingScrollAnchorAdjustment.ShallowSizeOfExcludingThis(mallocSizeOf);
 
+  StyleSet()->AddSizeOfIncludingThis(aSizes);
+
   aSizes.mLayoutTextRunsSize += SizeOfTextRuns(mallocSizeOf);
 
   aSizes.mLayoutPresContextSize +=
       mPresContext->SizeOfIncludingThis(mallocSizeOf);
 
   mFrameConstructor->AddSizeOfIncludingThis(aSizes);
 }