| Index: third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
|
| index a7b2a5158489d07609046a9a42fd854d8e73e544..4489b4f77d0a892c8966ec5783b46e3b1c91c744 100644
|
| --- a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "core/animation/DeferredLegacyStyleInterpolation.h"
|
|
|
| -#include "core/animation/ElementAnimations.h"
|
| -#include "core/animation/css/CSSAnimatableValueFactory.h"
|
| #include "core/css/CSSBasicShapeValues.h"
|
| #include "core/css/CSSImageValue.h"
|
| #include "core/css/CSSPrimitiveValue.h"
|
| @@ -14,34 +12,9 @@
|
| #include "core/css/CSSShadowValue.h"
|
| #include "core/css/CSSValueList.h"
|
| #include "core/css/CSSValuePair.h"
|
| -#include "core/css/resolver/StyleResolver.h"
|
| -#include "core/css/resolver/StyleResolverState.h"
|
|
|
| namespace blink {
|
|
|
| -void DeferredLegacyStyleInterpolation::apply(StyleResolverState& state) const
|
| -{
|
| - if (m_outdated || !state.element()->elementAnimations() || !state.element()->elementAnimations()->isAnimationStyleChange()) {
|
| - RefPtr<AnimatableValue> startAnimatableValue;
|
| - RefPtr<AnimatableValue> endAnimatableValue;
|
| -
|
| - // Snapshot underlying values for neutral keyframes first because non-neutral keyframes will mutate the StyleResolverState.
|
| - if (!m_endCSSValue) {
|
| - endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(state, m_id, m_endCSSValue.get());
|
| - startAnimatableValue = StyleResolver::createAnimatableValueSnapshot(state, m_id, m_startCSSValue.get());
|
| - } else {
|
| - startAnimatableValue = StyleResolver::createAnimatableValueSnapshot(state, m_id, m_startCSSValue.get());
|
| - endAnimatableValue = StyleResolver::createAnimatableValueSnapshot(state, m_id, m_endCSSValue.get());
|
| - }
|
| -
|
| - m_innerInterpolation = LegacyStyleInterpolation::create(startAnimatableValue, endAnimatableValue, m_id);
|
| - m_outdated = false;
|
| - }
|
| -
|
| - m_innerInterpolation->interpolate(m_cachedIteration, m_cachedFraction);
|
| - m_innerInterpolation->apply(state);
|
| -}
|
| -
|
| bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSValue& value)
|
| {
|
| // FIXME: should not require resolving styles for inherit/initial/unset.
|
|
|