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

Side by Side Diff: ui/compositor/test/layer_animator_test_controller.cc

Issue 1143433005: Remove gfx::FrameTime for a single clock source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling patch for mac files Created 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/animation.h" 5 #include "cc/animation/animation.h"
6 #include "ui/compositor/layer_animation_sequence.h" 6 #include "ui/compositor/layer_animation_sequence.h"
7 #include "ui/compositor/test/layer_animator_test_controller.h" 7 #include "ui/compositor/test/layer_animator_test_controller.h"
8 #include "ui/gfx/frame_time.h"
9 #include "ui/gfx/geometry/rect.h" 8 #include "ui/gfx/geometry/rect.h"
10 9
11 namespace ui { 10 namespace ui {
12 11
13 LayerAnimatorTestController::LayerAnimatorTestController( 12 LayerAnimatorTestController::LayerAnimatorTestController(
14 scoped_refptr<LayerAnimator> animator) 13 scoped_refptr<LayerAnimator> animator)
15 : animator_(animator) { 14 : animator_(animator) {
16 } 15 }
17 16
18 LayerAnimatorTestController::~LayerAnimatorTestController() { 17 LayerAnimatorTestController::~LayerAnimatorTestController() {
(...skipping 24 matching lines...) Expand all
43 LayerAnimationElement* element = sequence->CurrentElement(); 42 LayerAnimationElement* element = sequence->CurrentElement();
44 if (!(element->properties() & animatable_property)) 43 if (!(element->properties() & animatable_property))
45 continue; 44 continue;
46 45
47 if (!element->Started() || 46 if (!element->Started() ||
48 element->effective_start_time() != base::TimeTicks()) 47 element->effective_start_time() != base::TimeTicks())
49 continue; 48 continue;
50 49
51 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( 50 animator_->OnThreadedAnimationStarted(cc::AnimationEvent(
52 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), 51 cc::AnimationEvent::STARTED, 0, element->animation_group_id(),
53 threaded_properties[i], gfx::FrameTime::Now())); 52 threaded_properties[i], base::TimeTicks::Now()));
54 } 53 }
55 } 54 }
56 55
57 } // namespace ui 56 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698