Bug 1418836 - Add restyle markers in a place that I missed in bug 1350930. r?bz draft
authorMarkus Stange <mstange@themasta.com>
Sun, 19 Nov 2017 16:44:08 -0500
changeset 700332 bb6418cb54ab79cceafce0d3f2f37a4332d85139
parent 700331 f2ea6a15b2471db1498dbc68b41af29f85dd69f4
child 740830 98e0b11595015c55e59759a1744cb9a3281f1158
push id89787
push userbmo:mstange@themasta.com
push dateSun, 19 Nov 2017 21:49:28 +0000
reviewersbz
bugs1418836, 1350930
milestone59.0a1
Bug 1418836 - Add restyle markers in a place that I missed in bug 1350930. r?bz MozReview-Commit-ID: 4lj6W02JwHM
layout/base/PresShell.cpp
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -4213,16 +4213,22 @@ PresShell::DoFlushPendingNotifications(m
 
       if (aFlush.mFlushAnimations && mPresContext->EffectCompositor()) {
         mPresContext->EffectCompositor()->PostRestyleForThrottledAnimations();
       }
 
       // The FlushResampleRequests() above flushed style changes.
       if (!mIsDestroying) {
         nsAutoScriptBlocker scriptBlocker;
+#ifdef MOZ_GECKO_PROFILER
+        AutoProfilerTracing tracingStyleFlush("Paint", "Styles",
+                                              Move(mStyleCause));
+        mStyleCause = nullptr;
+#endif
+
         mPresContext->RestyleManager()->ProcessPendingRestyles();
       }
     }
 
     // Process whatever XBL constructors those restyles queued up.  This
     // ensures that onload doesn't fire too early and that we won't do extra
     // reflows after those constructors run.
     if (!mIsDestroying) {