Merge m-c to autoland, a=merge CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Tue, 18 Jul 2017 18:24:49 -0700
changeset 418201 1ba8ed71c08471ed9cf54f167a234eb6e285be54
parent 418200 e25a40d8d796db2f2c5c13e4089a2b03e7ef63f5 (current diff)
parent 418124 1b065ffd8a535a0ad4c39a912af18e948e6a42c1 (diff)
child 418202 43f2709d8e22729398d3bbc548937f1c3d877dd7
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone56.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
Merge m-c to autoland, a=merge CLOSED TREE MozReview-Commit-ID: 1XYfqTZv3GF
layout/base/nsCSSFrameConstructor.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -5881,18 +5881,20 @@ nsCSSFrameConstructor::AddFrameConstruct
           ServoRestyleManager::ClearServoDataFromSubtree(element);
           styleSet->StyleNewSubtree(element);
 
           // Servo's should_traverse_children() in traversal.rs skips
           // styling descendants of elements with a -moz-binding the
           // first time. Thus call StyleNewChildren() again.
           styleSet->StyleNewChildren(element);
 
+          // Because of LazyComputeBehavior::Assert we never create a style
+          // context here, so it's fine to pass a null parent.
           styleContext =
-            styleSet->ResolveStyleFor(element, styleContext->GetParentAllowServo()->AsServo(),
+            styleSet->ResolveStyleFor(element, nullptr,
                                       LazyComputeBehavior::Assert);
         } else {
           styleContext =
             ResolveStyleContext(styleContext->GetParent(), aContent, &aState);
         }
 
         display = styleContext->StyleDisplay();
         aStyleContext = styleContext;