Backed out changeset a33ae6fa707d (bug 1324618)

layout/reftests/bugs/reftest.list

@@ -36,7 +36,7 @@ asserts(2) skip-if(!cocoaWidget) HTTP(..) == 10209-3.html 10209-3-ref.html # Ass
 == 18217-zorder-4.html 18217-zorder-ref-inline-table.html
 == 18217-zorder-5.html 18217-zorder-ref-inline-table.html
 fails-if(styloVsGecko) == 23604-1.html 23604-1-ref.html
-== 23604-2.html 23604-2-ref.html
+fails-if(styloVsGecko) == 23604-2.html 23604-2-ref.html
 != 24998-1.html 24998-1-ref.html
 == 25888-1l.html 25888-1l-ref.html
 != 25888-1l.html 25888-1l-notref.html

layout/style/ServoBindingList.h

@@ -494,9 +494,7 @@ SERVO_BINDING_FUNC(Servo_ResolveStyle, ServoComputedValuesStrong,
 SERVO_BINDING_FUNC(Servo_ResolvePseudoStyle, ServoComputedValuesStrong,
                    RawGeckoElementBorrowed element,
                    mozilla::CSSPseudoElementType pseudo_type,
-                   bool is_probe,
-                   ServoComputedValuesBorrowedOrNull inherited_style,
-                   RawServoStyleSetBorrowed set)
+                   bool is_probe, RawServoStyleSetBorrowed set)
 SERVO_BINDING_FUNC(Servo_HasAuthorSpecifiedRules, bool,
                    RawGeckoElementBorrowed element,
                    uint32_t rule_type_mask,

layout/style/ServoStyleSet.cpp

@@ -568,6 +568,9 @@ ServoStyleSet::ResolvePseudoElementStyle(Element* aOriginatingElement,
 {
   UpdateStylistIfNeeded();
 
+  // NB: We ignore aParentContext, on the assumption that pseudo element styles
+  // should just inherit from aOriginatingElement's primary style, which Servo
+  // already knows.
   MOZ_ASSERT(aType < CSSPseudoElementType::Count);
 
   RefPtr<ServoComputedValues> computedValues;
@@ -576,13 +579,10 @@ ServoStyleSet::ResolvePseudoElementStyle(Element* aOriginatingElement,
     computedValues = Servo_ResolveStyle(aPseudoElement, mRawSet.get(),
                                         mAllowResolveStaleStyles).Consume();
   } else {
-    const ServoComputedValues* parentStyle =
-      aParentContext ? aParentContext->ComputedValues() : nullptr;
     computedValues =
       Servo_ResolvePseudoStyle(aOriginatingElement,
                                aType,
                                /* is_probe = */ false,
-                               parentStyle,
                                mRawSet.get()).Consume();
   }
 
@@ -918,17 +918,14 @@ ServoStyleSet::ProbePseudoElementStyle(Element* aOriginatingElement,
 {
   UpdateStylistIfNeeded();
 
-  // NB: We ignore aParentContext, because in some cases
-  // (first-line/first-letter on anonymous box blocks) Gecko passes something
-  // nonsensical there.  In all other cases we want to inherit directly from
-  // aOriginatingElement's styles anyway.
+  // NB: We ignore aParentContext, on the assumption that pseudo element styles
+  // should just inherit from aOriginatingElement's primary style, which Servo
+  // already knows.
   MOZ_ASSERT(aType < CSSPseudoElementType::Count);
 
   RefPtr<ServoComputedValues> computedValues =
     Servo_ResolvePseudoStyle(aOriginatingElement, aType,
-                             /* is_probe = */ true,
-                             nullptr,
-                             mRawSet.get()).Consume();
+                             /* is_probe = */ true, mRawSet.get()).Consume();
   if (!computedValues) {
     return nullptr;
   }