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

Side by Side Diff: Source/core/animation/AnimationPlayer.h

Issue 620783002: Devtools Animations: Basic animation inspection & control in Styles pane (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Changed sequence number to string id Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 bool maybeStartAnimationOnCompositor(); 134 bool maybeStartAnimationOnCompositor();
135 void cancelAnimationOnCompositor(); 135 void cancelAnimationOnCompositor();
136 bool hasActiveAnimationsOnCompositor(); 136 bool hasActiveAnimationsOnCompositor();
137 void setCompositorPending(bool sourceChanged = false); 137 void setCompositorPending(bool sourceChanged = false);
138 void notifyCompositorStartTime(double timelineTime); 138 void notifyCompositorStartTime(double timelineTime);
139 139
140 140
141 void preCommit(bool startOnCompositor); 141 void preCommit(bool startOnCompositor);
142 void postCommit(double timelineTime); 142 void postCommit(double timelineTime);
143 143
144 String id() const { return "s" + String::number(m_sequenceNumber); }
caseq 2014/10/03 12:43:55 Do we need the prefix and do we need this to happe
samli 2014/10/07 05:25:43 Done.
144 unsigned sequenceNumber() const { return m_sequenceNumber; } 145 unsigned sequenceNumber() const { return m_sequenceNumber; }
145 146
146 static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* play er2) 147 static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* play er2)
147 { 148 {
148 return player1->sequenceNumber() < player2->sequenceNumber(); 149 return player1->sequenceNumber() < player2->sequenceNumber();
149 } 150 }
150 151
151 #if !ENABLE(OILPAN) 152 #if !ENABLE(OILPAN)
152 // Checks if the AnimationStack is the last reference holder to the Player. 153 // Checks if the AnimationStack is the last reference holder to the Player.
153 // This won't be needed when AnimationPlayer is moved to Oilpan. 154 // This won't be needed when AnimationPlayer is moved to Oilpan.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // modifications are pushed to the compositor. 221 // modifications are pushed to the compositor.
221 OwnPtr<CompositorState> m_compositorState; 222 OwnPtr<CompositorState> m_compositorState;
222 bool m_compositorPending; 223 bool m_compositorPending;
223 bool m_currentTimePending; 224 bool m_currentTimePending;
224 bool m_idle; 225 bool m_idle;
225 }; 226 };
226 227
227 } // namespace blink 228 } // namespace blink
228 229
229 #endif 230 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/KeyframeEffectModel.h » ('j') | Source/core/animation/KeyframeEffectModel.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698