Bug 1324661 another followup: just simplify the chnagehint thing for now, with a followup filed. r=bholley
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 17 Feb 2017 17:50:24 -0500
changeset 372694 67ef6204c39823d2471293cd8e6554445d8e5625
parent 372693 f965e6ecfcb363d6b9a681647b80d2780d05c86a
child 372695 259591bde104bef38510868164bc1f32055fbdfc
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1324661
milestone54.0a1
Bug 1324661 another followup: just simplify the chnagehint thing for now, with a followup filed. r=bholley MozReview-Commit-ID: G9IvoODSOch
layout/base/ServoRestyleManager.cpp
--- a/layout/base/ServoRestyleManager.cpp
+++ b/layout/base/ServoRestyleManager.cpp
@@ -162,20 +162,19 @@ ServoRestyleManager::RecreateStyleContex
       // is actually a _child_ of the primary frame.  In that situation, we want
       // to go ahead and append the changeHint for the _parent_ but also append
       // all the parts of it not handled for descendants for the _child_.
       MOZ_ASSERT(styleFrame, "Or else GetPrimaryFrame() would be null too");
       MOZ_ASSERT(styleFrame->GetParent() == aElement->GetPrimaryFrame(),
                  "How did that happen?");
       aChangeListToProcess.AppendChange(aElement->GetPrimaryFrame(), aElement,
                                         changeHint);
-      nsChangeHint childHint = NS_HintsNotHandledForDescendantsIn(changeHint);
-      if (childHint) {
-        aChangeListToProcess.AppendChange(styleFrame, aElement, childHint);
-      }
+      // We may be able to do better here.
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1340717 tracks that.
+      aChangeListToProcess.AppendChange(styleFrame, aElement, changeHint);
     } else {
       aChangeListToProcess.AppendChange(styleFrame, aElement, changeHint);
     }
   }
 
   // If our change hint is reconstruct, we delegate to the frame constructor,
   // which consumes the new style and expects the old style to be on the frame.
   //