Bug 1381764 - style: More ComputedValuesInner cleanup. r=Manishearth on a CLOSED TREE

MozReview-Commit-ID: 8rkAP3pMEpD

dom/animation/KeyframeEffectReadOnly.cpp

@@ -563,7 +563,7 @@ KeyframeEffectReadOnly::EnsureBaseStyle(
           aComputedStyle);
   }
   RefPtr<RawServoAnimationValue> baseValue =
-    Servo_ComputedValues_ExtractAnimationValue(aBaseStyleContext->ComputedValues(),
+    Servo_ComputedValues_ExtractAnimationValue(aBaseStyleContext,
                                                aProperty.mProperty).Consume();
   mBaseStyleValuesForServo.Put(aProperty.mProperty, baseValue);
 }

dom/smil/nsSMILCSSProperty.cpp

@@ -68,10 +68,8 @@ nsSMILCSSProperty::GetBaseValue() const
 
   AnimationValue computedValue;
   if (mElement->IsStyledByServo()) {
-    const ServoComputedValues* currentStyle =
-      mBaseStyleContext->ComputedValues();
     computedValue.mServo =
-      Servo_ComputedValues_ExtractAnimationValue(currentStyle, mPropID)
+      Servo_ComputedValues_ExtractAnimationValue(mBaseStyleContext->AsServo(), mPropID)
       .Consume();
     if (!computedValue.mServo) {
       return baseValue;

layout/style/ServoBindingList.h

@@ -232,7 +232,7 @@ SERVO_BINDING_FUNC(Servo_GetComputedKeyframeValues, void,
                    RawGeckoComputedKeyframeValuesListBorrowedMut result)
 SERVO_BINDING_FUNC(Servo_ComputedValues_ExtractAnimationValue,
                    RawServoAnimationValueStrong,
-                   ServoComputedValuesBorrowed computed_values,
+                   ServoStyleContextBorrowed computed_values,
                    nsCSSPropertyID property)
 SERVO_BINDING_FUNC(Servo_ComputedValues_SpecifiesAnimationsOrTransitions, bool,
                    ServoComputedValuesBorrowed computed_values)

layout/style/nsTransitionManager.cpp

@@ -454,7 +454,7 @@ ExtractNonDiscreteComputedValue(nsCSSPropertyID aProperty,
   }
 
   aAnimationValue.mServo =
-    Servo_ComputedValues_ExtractAnimationValue(aComputedStyle->ComputedValues(),
+    Servo_ComputedValues_ExtractAnimationValue(aComputedStyle,
                                                aProperty).Consume();
   return !!aAnimationValue.mServo;
 }