| Index: third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
|
| index ab4703d3570cf134c0411892dfa8f1915a6bc060..e31edd7770bc43e97a7a47c9f33ff0dde8f0f22b 100644
|
| --- a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.cpp
|
| @@ -60,22 +60,14 @@ void KeyframeEffectModelBase::setFrames(KeyframeVector& keyframes)
|
| m_keyframes = keyframes;
|
| m_keyframeGroups = nullptr;
|
| m_interpolationEffect.clear();
|
| - m_lastFraction = std::numeric_limits<double>::quiet_NaN();
|
| + clearLastFraction();
|
| }
|
|
|
| -bool KeyframeEffectModelBase::sample(int iteration, double fraction, double iterationDuration, Vector<RefPtr<Interpolation>>& result) const
|
| +void KeyframeEffectModelBase::sampleImpl(int iteration, double fraction, double iterationDuration, Vector<RefPtr<Interpolation>>& result) const
|
| {
|
| - ASSERT(iteration >= 0);
|
| - ASSERT(!isNull(fraction));
|
| ensureKeyframeGroups();
|
| ensureInterpolationEffectPopulated();
|
| -
|
| - bool changed = iteration != m_lastIteration || fraction != m_lastFraction || iterationDuration != m_lastIterationDuration;
|
| - m_lastIteration = iteration;
|
| - m_lastFraction = fraction;
|
| - m_lastIterationDuration = iterationDuration;
|
| m_interpolationEffect.getActiveInterpolations(fraction, iterationDuration, result);
|
| - return changed;
|
| }
|
|
|
| bool KeyframeEffectModelBase::snapshotNeutralCompositorKeyframes(Element& element, const ComputedStyle& oldStyle, const ComputedStyle& newStyle, const ComputedStyle* parentStyle) const
|
| @@ -152,14 +144,6 @@ KeyframeEffectModelBase::KeyframeVector KeyframeEffectModelBase::normalizedKeyfr
|
| return result;
|
| }
|
|
|
| -bool KeyframeEffectModelBase::isTransformRelatedEffect() const
|
| -{
|
| - return affects(PropertyHandle(CSSPropertyTransform))
|
| - || affects(PropertyHandle(CSSPropertyRotate))
|
| - || affects(PropertyHandle(CSSPropertyScale))
|
| - || affects(PropertyHandle(CSSPropertyTranslate));
|
| -}
|
| -
|
| void KeyframeEffectModelBase::ensureKeyframeGroups() const
|
| {
|
| if (m_keyframeGroups)
|
|
|