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

Unified Diff: sky/engine/core/animation/AnimationPlayer.h

Issue 772673002: Fix Animations, Remove Compostior Animations. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cleanup Created 6 years 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: sky/engine/core/animation/AnimationPlayer.h
diff --git a/sky/engine/core/animation/AnimationPlayer.h b/sky/engine/core/animation/AnimationPlayer.h
index 863a6dcec62065a659bf89b3c681e3e0c5bc1372..ec70140cd78ba21926a5bdbd03cb62b30a80ed67 100644
--- a/sky/engine/core/animation/AnimationPlayer.h
+++ b/sky/engine/core/animation/AnimationPlayer.h
@@ -116,17 +116,13 @@ public:
// Pausing via this method is not reflected in the value returned by
// paused() and must never overlap with pausing via pause().
- void pauseForTesting(double pauseTime);
+ // void pauseForTesting(double pauseTime);
// This should only be used for CSS
void unpause();
void setOutdated();
bool outdated() { return m_outdated; }
- bool canStartAnimationOnCompositor();
- bool maybeStartAnimationOnCompositor();
- void cancelAnimationOnCompositor();
- bool hasActiveAnimationsOnCompositor();
void setCompositorPending(bool sourceChanged = false);
void notifyCompositorStartTime(double timelineTime);
@@ -177,33 +173,7 @@ private:
// event is actually dispatched.
RefPtr<Event> m_pendingFinishedEvent;
- enum CompositorAction {
- None,
- Pause,
- Start,
- PauseThenStart
- };
-
- class CompositorState {
- public:
- CompositorState(AnimationPlayer& player)
- : startTime(player.m_startTime)
- , holdTime(player.m_holdTime)
- , playbackRate(player.m_playbackRate)
- , sourceChanged(false)
- , pendingAction(Start)
- { }
- double startTime;
- double holdTime;
- double playbackRate;
- bool sourceChanged;
- CompositorAction pendingAction;
- };
-
- // This mirrors the known compositor state. It is created when a compositor
- // animation is started. Updated once the start time is known and each time
- // modifications are pushed to the compositor.
- OwnPtr<CompositorState> m_compositorState;
+ // FIXME(rafaelw): Do we still need this?
bool m_compositorPending;
bool m_currentTimePending;
};

Powered by Google App Engine
This is Rietveld 408576698