Bug 1367904 - Part 5: stylo: Make GetBaseComputedValuesForElement return a style context; r=bholley

MozReview-Commit-ID: K5WpWc26xNZ

dom/animation/KeyframeEffectReadOnly.cpp

@@ -513,13 +513,13 @@ KeyframeEffectReadOnly::EnsureBaseStyles(
              "supposed to be called right after getting computed values with "
              "a valid nsPresContext");
 
-  RefPtr<const ServoComputedValues> baseComputedValues;
+  RefPtr<ServoStyleContext> baseStyleContext;
   for (const AnimationProperty& property : aProperties) {
     EnsureBaseStyle(property,
                     mTarget->mPseudoType,
                     presContext,
                     aComputedValues,
-                    baseComputedValues);
+                    baseStyleContext);
   }
 }
 
@@ -529,7 +529,7 @@ KeyframeEffectReadOnly::EnsureBaseStyle(
   CSSPseudoElementType aPseudoType,
   nsPresContext* aPresContext,
   const ServoComputedValues* aComputedStyle,
-  RefPtr<const ServoComputedValues>& aBaseComputedValues)
+ RefPtr<ServoStyleContext>& aBaseStyleContext)
 {
   bool hasAdditiveValues = false;
 
@@ -544,15 +544,18 @@ KeyframeEffectReadOnly::EnsureBaseStyle(
     return;
   }
 
-  if (!aBaseComputedValues) {
+  if (!aBaseStyleContext) {
-    aBaseComputedValues =
+    aBaseStyleContext =
-      aPresContext->StyleSet()->AsServo()->GetBaseComputedValuesForElement(
+      aPresContext->StyleSet()->AsServo()->GetBaseContextForElement(
           mTarget->mElement,
+          nullptr,
+          aPresContext,
+          nullptr,
           aPseudoType,
           aComputedStyle);
   }
   RefPtr<RawServoAnimationValue> baseValue =
-    Servo_ComputedValues_ExtractAnimationValue(aBaseComputedValues,
+    Servo_ComputedValues_ExtractAnimationValue(aBaseStyleContext->ComputedValues(),
                                                aProperty.mProperty).Consume();
   mBaseStyleValuesForServo.Put(aProperty.mProperty, baseValue);
 }

dom/animation/KeyframeEffectReadOnly.h

@@ -45,6 +45,7 @@ class ErrorResult;
 struct AnimationRule;
 struct TimingParams;
 class EffectSet;
+class ServoStyleContext;
 
 namespace dom {
 class ElementOrCSSPseudoElement;
@@ -385,7 +386,7 @@ protected:
                        CSSPseudoElementType aPseudoType,
                        nsPresContext* aPresContext,
                        const ServoComputedValues* aComputedValues,
-                       RefPtr<const ServoComputedValues>& aBaseComputedValues);
+                       RefPtr<mozilla::ServoStyleContext>& aBaseComputedValues);
 
   Maybe<OwningAnimationTarget> mTarget;
 

layout/style/ServoStyleSet.cpp

@@ -1093,17 +1093,22 @@ ServoStyleSet::GetAnimationValues(
                            &aAnimationValues);
 }
 
-already_AddRefed<ServoComputedValues>
+already_AddRefed<ServoStyleContext>
-ServoStyleSet::GetBaseComputedValuesForElement(
+ServoStyleSet::GetBaseContextForElement(
   Element* aElement,
+  nsStyleContext* aParentContext,
+  nsPresContext* aPresContext,
+  nsIAtom* aPseudoTag,
   CSSPseudoElementType aPseudoType,
   ServoComputedValuesBorrowed aStyle)
 {
-  return Servo_StyleSet_GetBaseComputedValuesForElement(mRawSet.get(),
+  RefPtr<ServoComputedValues> cv = Servo_StyleSet_GetBaseComputedValuesForElement(mRawSet.get(),
                                                         aElement,
                                                         aStyle,
                                                         &Snapshots(),
                                                         aPseudoType).Consume();
+  return ServoStyleContext::Create(nullptr, aPresContext, aPseudoTag,
+                                   aPseudoType, cv.forget());
 }
 
 already_AddRefed<RawServoAnimationValue>

layout/style/ServoStyleSet.h

@@ -382,10 +382,13 @@ public:
 
   nsCSSCounterStyleRule* CounterStyleRuleForName(nsIAtom* aName);
 
-  already_AddRefed<ServoComputedValues>
+  already_AddRefed<ServoStyleContext>
-  GetBaseComputedValuesForElement(dom::Element* aElement,
+  GetBaseContextForElement(dom::Element* aElement,
-                                  CSSPseudoElementType aPseudoType,
+                           nsStyleContext* aParentContext,
-                                  ServoComputedValuesBorrowed aStyle);
+                           nsPresContext* aPresContext,
+                           nsIAtom* aPseudoTag,
+                           CSSPseudoElementType aPseudoType,
+                           ServoComputedValuesBorrowed aStyle);
 
   /**
    * Resolve style for a given declaration block with/without the parent style.

layout/style/nsComputedDOMStyle.cpp

@@ -640,12 +640,9 @@ nsComputedDOMStyle::DoGetStyleContextNoFlush(Element* aElement,
             return styleSet->ResolveStyleByRemovingAnimation(
                      aElement, result, eRestyle_AllHintsWithAnimations);
           } else {
-            RefPtr<ServoComputedValues> baseComputedValues =
+              return presContext->StyleSet()->AsServo()->
-              presContext->StyleSet()->AsServo()->
+                GetBaseContextForElement(aElement, nullptr, presContext,
-                GetBaseComputedValuesForElement(
+                                         aPseudo, pseudoType, result->ComputedValues());
-                    aElement, pseudoType, result->ComputedValues());
-            return ServoStyleContext::Create(nullptr, presContext, aPseudo,
-                                             pseudoType, baseComputedValues.forget());
           }
         }
 
@@ -677,11 +674,8 @@ nsComputedDOMStyle::DoGetStyleContextNoFlush(Element* aElement,
       return result.forget();
     }
 
-    RefPtr<ServoComputedValues> baseComputedValues =
+    return servoSet->GetBaseContextForElement(aElement, nullptr, presContext,
-      servoSet->GetBaseComputedValuesForElement(
+                                              aPseudo, pseudoType, result->ComputedValues());
-          aElement, pseudoType, result->ComputedValues());
-    return ServoStyleContext::Create(nullptr, presContext, aPseudo,
-                                     pseudoType, baseComputedValues.forget());
   }
 
   RefPtr<nsStyleContext> parentContext;

layout/style/nsStyleContext.cpp

@@ -622,7 +622,7 @@ nsStyleContext::Destroy()
   }
 }
 
-already_AddRefed<nsStyleContext>
+already_AddRefed<GeckoStyleContext>
 NS_NewStyleContext(nsStyleContext* aParentContext,
                    nsIAtom* aPseudoTag,
                    CSSPseudoElementType aPseudoType,
@@ -630,7 +630,7 @@ NS_NewStyleContext(nsStyleContext* aParentContext,
                    bool aSkipParentDisplayBasedStyleFixup)
 {
   RefPtr<nsRuleNode> node = aRuleNode;
-  RefPtr<nsStyleContext> context =
+  RefPtr<GeckoStyleContext> context =
     new (aRuleNode->PresContext())
     GeckoStyleContext(aParentContext, aPseudoTag, aPseudoType, node.forget(),
                    aSkipParentDisplayBasedStyleFixup);

layout/style/nsStyleContext.h

@@ -467,7 +467,7 @@ protected:
 #endif
 };
 
-already_AddRefed<nsStyleContext>
+already_AddRefed<mozilla::GeckoStyleContext>
 NS_NewStyleContext(nsStyleContext* aParentContext,
                    nsIAtom* aPseudoTag,
                    mozilla::CSSPseudoElementType aPseudoType,