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

Side by Side Diff: trunk/src/cc/animation/layer_animation_controller.cc

Issue 254883004: Revert 266624 "cc: Split animating and drawing into separate act..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/cc/input/input_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/animation/layer_animation_controller.h" 5 #include "cc/animation/layer_animation_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "cc/animation/animation.h" 9 #include "cc/animation/animation.h"
10 #include "cc/animation/animation_delegate.h" 10 #include "cc/animation/animation_delegate.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 NOTREACHED(); 198 NOTREACHED();
199 } 199 }
200 } 200 }
201 } 201 }
202 202
203 void LayerAnimationController::UpdateState(bool start_ready_animations, 203 void LayerAnimationController::UpdateState(bool start_ready_animations,
204 AnimationEventsVector* events) { 204 AnimationEventsVector* events) {
205 if (!HasActiveValueObserver()) 205 if (!HasActiveValueObserver())
206 return; 206 return;
207 207
208 DCHECK(last_tick_time_);
209 if (start_ready_animations) 208 if (start_ready_animations)
210 PromoteStartedAnimations(last_tick_time_, events); 209 PromoteStartedAnimations(last_tick_time_, events);
211 210
212 MarkFinishedAnimations(last_tick_time_); 211 MarkFinishedAnimations(last_tick_time_);
213 MarkAnimationsForDeletion(last_tick_time_, events); 212 MarkAnimationsForDeletion(last_tick_time_, events);
214 213
215 if (start_ready_animations) { 214 if (start_ready_animations) {
216 StartAnimations(last_tick_time_); 215 StartAnimations(last_tick_time_);
217 PromoteStartedAnimations(last_tick_time_, events); 216 PromoteStartedAnimations(last_tick_time_, events);
218 } 217 }
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 value_observers_); 872 value_observers_);
874 LayerAnimationValueObserver* obs; 873 LayerAnimationValueObserver* obs;
875 while ((obs = it.GetNext()) != NULL) 874 while ((obs = it.GetNext()) != NULL)
876 if (obs->IsActive()) 875 if (obs->IsActive())
877 return true; 876 return true;
878 } 877 }
879 return false; 878 return false;
880 } 879 }
881 880
882 } // namespace cc 881 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | trunk/src/cc/input/input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698