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

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

Issue 1700653002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 unified diff | Download patch
« no previous file with comments | « ui/compositor/layer_animator_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "cc/animation/animation.h" 7 #include "cc/animation/animation.h"
8 #include "cc/animation/animation_events.h" 8 #include "cc/animation/animation_events.h"
9 #include "ui/compositor/layer_animation_sequence.h" 9 #include "ui/compositor/layer_animation_sequence.h"
10 #include "ui/compositor/test/layer_animator_test_controller.h" 10 #include "ui/compositor/test/layer_animator_test_controller.h"
(...skipping 13 matching lines...) Expand all
24 LayerAnimationElement::AnimatableProperty property) { 24 LayerAnimationElement::AnimatableProperty property) {
25 LayerAnimator::RunningAnimation* running_animation = 25 LayerAnimator::RunningAnimation* running_animation =
26 animator_->GetRunningAnimation(property); 26 animator_->GetRunningAnimation(property);
27 if (running_animation) 27 if (running_animation)
28 return running_animation->sequence(); 28 return running_animation->sequence();
29 else 29 else
30 return NULL; 30 return NULL;
31 } 31 }
32 32
33 void LayerAnimatorTestController::StartThreadedAnimationsIfNeeded() { 33 void LayerAnimatorTestController::StartThreadedAnimationsIfNeeded() {
34 std::vector<cc::Animation::TargetProperty> threaded_properties; 34 std::vector<cc::TargetProperty::Type> threaded_properties;
35 threaded_properties.push_back(cc::Animation::OPACITY); 35 threaded_properties.push_back(cc::TargetProperty::OPACITY);
36 threaded_properties.push_back(cc::Animation::TRANSFORM); 36 threaded_properties.push_back(cc::TargetProperty::TRANSFORM);
37 37
38 for (size_t i = 0; i < threaded_properties.size(); i++) { 38 for (size_t i = 0; i < threaded_properties.size(); i++) {
39 LayerAnimationElement::AnimatableProperty animatable_property = 39 LayerAnimationElement::AnimatableProperty animatable_property =
40 LayerAnimationElement::ToAnimatableProperty(threaded_properties[i]); 40 LayerAnimationElement::ToAnimatableProperty(threaded_properties[i]);
41 LayerAnimationSequence* sequence = GetRunningSequence(animatable_property); 41 LayerAnimationSequence* sequence = GetRunningSequence(animatable_property);
42 if (!sequence) 42 if (!sequence)
43 continue; 43 continue;
44 44
45 LayerAnimationElement* element = sequence->CurrentElement(); 45 LayerAnimationElement* element = sequence->CurrentElement();
46 if (!(element->properties() & animatable_property)) 46 if (!(element->properties() & animatable_property))
47 continue; 47 continue;
48 48
49 if (!element->Started() || 49 if (!element->Started() ||
50 element->effective_start_time() != base::TimeTicks()) 50 element->effective_start_time() != base::TimeTicks())
51 continue; 51 continue;
52 52
53 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( 53 animator_->OnThreadedAnimationStarted(cc::AnimationEvent(
54 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), 54 cc::AnimationEvent::STARTED, 0, element->animation_group_id(),
55 threaded_properties[i], base::TimeTicks::Now())); 55 threaded_properties[i], base::TimeTicks::Now()));
56 } 56 }
57 } 57 }
58 58
59 void LayerAnimatorTestController::Step(const base::TimeDelta& duration) { 59 void LayerAnimatorTestController::Step(const base::TimeDelta& duration) {
60 animator_->Step(animator_->last_step_time() + duration); 60 animator_->Step(animator_->last_step_time() + duration);
61 } 61 }
62 62
63 } // namespace ui 63 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/layer_animator_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698