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

Side by Side Diff: ui/gfx/compositor/layer_animation_sequence.cc

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month 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
OLDNEW
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
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");
33 if (elements_.size() == 0 || duration_ == base::TimeDelta()) 32 if (elements_.size() == 0 || duration_ == base::TimeDelta())
34 return; 33 return;
35 34
36 if (is_cyclic_) { 35 if (is_cyclic_) {
37 // If delta = elapsed - last_start_ is huge, we can skip ahead by complete 36 // If delta = elapsed - last_start_ is huge, we can skip ahead by complete
38 // loops to save time. 37 // loops to save time.
39 base::TimeDelta delta = elapsed - last_start_; 38 base::TimeDelta delta = elapsed - last_start_;
40 int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1; 39 int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1;
41 if (k > 0) { 40 if (k > 0) {
42 last_start_ += base::TimeDelta::FromInternalValue( 41 last_start_ += base::TimeDelta::FromInternalValue(
(...skipping 19 matching lines...) Expand all
62 } 61 }
63 elements_[current_index]->Progress(t, delegate); 62 elements_[current_index]->Progress(t, delegate);
64 } 63 }
65 64
66 if (!is_cyclic_ && elapsed == duration_) { 65 if (!is_cyclic_ && elapsed == duration_) {
67 last_element_ = 0; 66 last_element_ = 0;
68 last_start_ = base::TimeDelta::FromMilliseconds(0); 67 last_start_ = base::TimeDelta::FromMilliseconds(0);
69 } 68 }
70 } 69 }
71 70
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
72 void LayerAnimationSequence::Abort() { 80 void LayerAnimationSequence::Abort() {
73 size_t current_index = last_element_ % elements_.size(); 81 size_t current_index = last_element_ % elements_.size();
74 while (current_index < elements_.size()) { 82 while (current_index < elements_.size()) {
75 elements_[current_index]->Abort(); 83 elements_[current_index]->Abort();
76 ++current_index; 84 ++current_index;
77 } 85 }
78 last_element_ = 0; 86 last_element_ = 0;
79 last_start_ = base::TimeDelta::FromMilliseconds(0); 87 last_start_ = base::TimeDelta::FromMilliseconds(0);
80 } 88 }
81 89
(...skipping 10 matching lines...) Expand all
92 LayerAnimationElement::AnimatableProperties intersection; 100 LayerAnimationElement::AnimatableProperties intersection;
93 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii( 101 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii(
94 intersection, intersection.begin()); 102 intersection, intersection.begin());
95 std::set_intersection(properties_.begin(), properties_.end(), 103 std::set_intersection(properties_.begin(), properties_.end(),
96 other.begin(), other.end(), 104 other.begin(), other.end(),
97 ii); 105 ii);
98 return intersection.size() > 0; 106 return intersection.size() > 0;
99 } 107 }
100 108
101 } // namespace ui 109 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer_animation_sequence.h ('k') | ui/gfx/compositor/layer_animation_sequence_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698