Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: third_party/WebKit/Source/core/animation/KeyframeEffectModel.h

Issue 2236193002: WIP: Implement CSS transitions on top of InterpolationTypes instead of AnimatableValues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_environmentStyle
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/KeyframeEffectModel.h
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.h b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.h
index 5b6c806b335a9ed0fd673aec973b20f00f85d6fa..e61519b906fb93bbe4c447f6659ac913d7633623 100644
--- a/third_party/WebKit/Source/core/animation/KeyframeEffectModel.h
+++ b/third_party/WebKit/Source/core/animation/KeyframeEffectModel.h
@@ -91,9 +91,6 @@ public:
return *m_keyframeGroups;
}
- // EffectModel implementation.
- bool sample(int iteration, double fraction, double iterationDuration, Vector<RefPtr<Interpolation>>&) const override;
-
bool isKeyframeEffectModel() const override { return true; }
virtual bool isAnimatableValueKeyframeEffectModel() const { return false; }
@@ -117,19 +114,16 @@ public:
return m_keyframeGroups->contains(property);
}
- bool isTransformRelatedEffect() const override;
-
protected:
KeyframeEffectModelBase(PassRefPtr<TimingFunction> defaultKeyframeEasing)
- : m_lastIteration(0)
- , m_lastFraction(std::numeric_limits<double>::quiet_NaN())
- , m_lastIterationDuration(0)
- , m_defaultKeyframeEasing(defaultKeyframeEasing)
+ : m_defaultKeyframeEasing(defaultKeyframeEasing)
, m_hasSyntheticKeyframes(false)
, m_needsCompositorKeyframesSnapshot(true)
{
}
+ void sampleImpl(int iteration, double fraction, double iterationDuration, Vector<RefPtr<Interpolation>>&) const final;
+
static KeyframeVector normalizedKeyframes(const KeyframeVector& keyframes);
// Lazily computes the groups of property-specific keyframes.
@@ -142,9 +136,6 @@ protected:
// property-specific lists.
mutable std::unique_ptr<KeyframeGroupMap> m_keyframeGroups;
mutable InterpolationEffect m_interpolationEffect;
- mutable int m_lastIteration;
- mutable double m_lastFraction;
- mutable double m_lastIterationDuration;
RefPtr<TimingFunction> m_defaultKeyframeEasing;
mutable bool m_hasSyntheticKeyframes;

Powered by Google App Engine
This is Rietveld 408576698