Add ComputedStyle constructor and getter to InterpolationEnvironment

third_party/WebKit/Source/core/animation/CSSBasicShapeInterpolationType.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/animation/CSSBasicShapeInterpolationType.h"
 
 #include "core/animation/BasicShapeInterpolationFunctions.h"
 #include "core/animation/BasicShapePropertyFunctions.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/resolver/StyleResolverState.h"
@@ skipping 85 matching lines @@
 
 PairwiseInterpolationValue CSSBasicShapeInterpolationType::maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end) const
 {
     if (!BasicShapeInterpolationFunctions::shapesAreCompatible(*start.nonInterpolableValue, *end.nonInterpolableValue))
         return nullptr;
     return PairwiseInterpolationValue(std::move(start.interpolableValue), std::move(end.interpolableValue), start.nonInterpolableValue.release());
 }
 
 InterpolationValue CSSBasicShapeInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
 {
-    const ComputedStyle& style = *environment.state().style();
+    const ComputedStyle& style = environment.style();
     return BasicShapeInterpolationFunctions::maybeConvertBasicShape(
         BasicShapePropertyFunctions::getBasicShape(cssProperty(), style), style.effectiveZoom());
 }
 
 void CSSBasicShapeInterpolationType::composite(UnderlyingValueOwner& underlyingValueOwner, double underlyingFraction, const InterpolationValue& value, double interpolationFraction) const
 {
     if (!BasicShapeInterpolationFunctions::shapesAreCompatible(*underlyingValueOwner.value().nonInterpolableValue, *value.nonInterpolableValue)) {
         underlyingValueOwner.set(*this, value);
         return;
     }
 
     underlyingValueOwner.mutableValue().interpolableValue->scaleAndAdd(underlyingFraction, *value.interpolableValue);
 }
 
 void CSSBasicShapeInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const
 {
-    BasicShapePropertyFunctions::setBasicShape(cssProperty(), *environment.state().style(),
+    BasicShapePropertyFunctions::setBasicShape(cssProperty(), environment.style(),
         BasicShapeInterpolationFunctions::createBasicShape(interpolableValue, *nonInterpolableValue, environment.state().cssToLengthConversionData()));
 }
 
 } // namespace blink