OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/gfx/compositor/layer_animation_sequence.h" | 5 #include "ui/gfx/compositor/layer_animation_sequence.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 : is_cyclic_(false), | 22 : is_cyclic_(false), |
23 last_element_(0) { | 23 last_element_(0) { |
24 AddElement(element); | 24 AddElement(element); |
25 } | 25 } |
26 | 26 |
27 LayerAnimationSequence::~LayerAnimationSequence() { | 27 LayerAnimationSequence::~LayerAnimationSequence() { |
28 } | 28 } |
29 | 29 |
30 void LayerAnimationSequence::Progress(base::TimeDelta elapsed, | 30 void LayerAnimationSequence::Progress(base::TimeDelta elapsed, |
31 LayerAnimationDelegate* delegate) { | 31 LayerAnimationDelegate* delegate) { |
| 32 TRACE_EVENT0("LayerAnimationSequence", "Progress"); |
32 if (elements_.size() == 0 || duration_ == base::TimeDelta()) | 33 if (elements_.size() == 0 || duration_ == base::TimeDelta()) |
33 return; | 34 return; |
34 | 35 |
35 if (is_cyclic_) { | 36 if (is_cyclic_) { |
36 // If delta = elapsed - last_start_ is huge, we can skip ahead by complete | 37 // If delta = elapsed - last_start_ is huge, we can skip ahead by complete |
37 // loops to save time. | 38 // loops to save time. |
38 base::TimeDelta delta = elapsed - last_start_; | 39 base::TimeDelta delta = elapsed - last_start_; |
39 int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1; | 40 int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1; |
40 if (k > 0) { | 41 if (k > 0) { |
41 last_start_ += base::TimeDelta::FromInternalValue( | 42 last_start_ += base::TimeDelta::FromInternalValue( |
(...skipping 19 matching lines...) Expand all Loading... |
61 } | 62 } |
62 elements_[current_index]->Progress(t, delegate); | 63 elements_[current_index]->Progress(t, delegate); |
63 } | 64 } |
64 | 65 |
65 if (!is_cyclic_ && elapsed == duration_) { | 66 if (!is_cyclic_ && elapsed == duration_) { |
66 last_element_ = 0; | 67 last_element_ = 0; |
67 last_start_ = base::TimeDelta::FromMilliseconds(0); | 68 last_start_ = base::TimeDelta::FromMilliseconds(0); |
68 } | 69 } |
69 } | 70 } |
70 | 71 |
71 void LayerAnimationSequence::GetTargetValue( | |
72 LayerAnimationElement::TargetValue* target) const { | |
73 if (is_cyclic_) | |
74 return; | |
75 | |
76 for (size_t i = last_element_; i < elements_.size(); ++i) | |
77 elements_[i]->GetTargetValue(target); | |
78 } | |
79 | |
80 void LayerAnimationSequence::Abort() { | 72 void LayerAnimationSequence::Abort() { |
81 size_t current_index = last_element_ % elements_.size(); | 73 size_t current_index = last_element_ % elements_.size(); |
82 while (current_index < elements_.size()) { | 74 while (current_index < elements_.size()) { |
83 elements_[current_index]->Abort(); | 75 elements_[current_index]->Abort(); |
84 ++current_index; | 76 ++current_index; |
85 } | 77 } |
86 last_element_ = 0; | 78 last_element_ = 0; |
87 last_start_ = base::TimeDelta::FromMilliseconds(0); | 79 last_start_ = base::TimeDelta::FromMilliseconds(0); |
88 } | 80 } |
89 | 81 |
(...skipping 10 matching lines...) Expand all Loading... |
100 LayerAnimationElement::AnimatableProperties intersection; | 92 LayerAnimationElement::AnimatableProperties intersection; |
101 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii( | 93 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii( |
102 intersection, intersection.begin()); | 94 intersection, intersection.begin()); |
103 std::set_intersection(properties_.begin(), properties_.end(), | 95 std::set_intersection(properties_.begin(), properties_.end(), |
104 other.begin(), other.end(), | 96 other.begin(), other.end(), |
105 ii); | 97 ii); |
106 return intersection.size() > 0; | 98 return intersection.size() > 0; |
107 } | 99 } |
108 | 100 |
109 } // namespace ui | 101 } // namespace ui |
OLD | NEW |