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

Unified Diff: Source/core/animation/SampledEffect.h

Issue 967523002: Revert of Web Animations: Remove AnimationPlayer discarding logic (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | Source/core/animation/SampledEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/SampledEffect.h
diff --git a/Source/core/animation/SampledEffect.h b/Source/core/animation/SampledEffect.h
index 2f090f3b8ee28434a363f691453b0523f6905243..e3cc745c9e8c37bf84400242ab951b39ff76ad6b 100644
--- a/Source/core/animation/SampledEffect.h
+++ b/Source/core/animation/SampledEffect.h
@@ -20,6 +20,7 @@
return adoptPtrWillBeNoop(new SampledEffect(animation, interpolations));
}
+ bool canChange() const;
void clear();
const WillBeHeapVector<RefPtrWillBeMember<Interpolation> >& interpolations() const { return *m_interpolations; }
@@ -35,13 +36,17 @@
unsigned sequenceNumber() const { return m_sequenceNumber; }
Animation::Priority priority() const { return m_priority; }
+ void removeReplacedInterpolationsIfNeeded(const BitArray<numCSSProperties>&);
+
DECLARE_TRACE();
private:
SampledEffect(Animation*, PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > >);
RawPtrWillBeWeakMember<Animation> m_animation;
- RefPtrWillBeMember<AnimationPlayer> m_player;
+#if !ENABLE(OILPAN)
+ RefPtr<AnimationPlayer> m_player;
+#endif
OwnPtrWillBeMember<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> m_interpolations;
const unsigned m_sequenceNumber;
Animation::Priority m_priority;
« no previous file with comments | « Source/core/animation/AnimationStackTest.cpp ('k') | Source/core/animation/SampledEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698