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

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 with parent patch Created 9 years, 2 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
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 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "ui/gfx/compositor/layer_animation_delegate.h" 10 #include "ui/gfx/compositor/layer_animation_delegate.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 elements_[current_index]->Progress(t, delegate); 62 elements_[current_index]->Progress(t, delegate);
63 } 63 }
64 64
65 if (!is_cyclic_ && elapsed == duration_) { 65 if (!is_cyclic_ && elapsed == duration_) {
66 last_element_ = 0; 66 last_element_ = 0;
67 last_start_ = base::TimeDelta::FromMilliseconds(0); 67 last_start_ = base::TimeDelta::FromMilliseconds(0);
68 } 68 }
69 } 69 }
70 70
71 void LayerAnimationSequence::SetTarget(LayerAnimationDelegate* delegate) const {
72 if (is_cyclic_)
73 return;
74
75 for (size_t i = last_element_; i < elements_.size(); ++i)
76 elements_[i]->SetTarget(delegate);
77 }
78
71 void LayerAnimationSequence::Abort() { 79 void LayerAnimationSequence::Abort() {
72 size_t current_index = last_element_ % elements_.size(); 80 size_t current_index = last_element_ % elements_.size();
73 while (current_index < elements_.size()) { 81 while (current_index < elements_.size()) {
74 elements_[current_index]->Abort(); 82 elements_[current_index]->Abort();
75 ++current_index; 83 ++current_index;
76 } 84 }
77 last_element_ = 0; 85 last_element_ = 0;
78 last_start_ = base::TimeDelta::FromMilliseconds(0); 86 last_start_ = base::TimeDelta::FromMilliseconds(0);
79 } 87 }
80 88
(...skipping 10 matching lines...) Expand all
91 LayerAnimationElement::AnimatableProperties intersection; 99 LayerAnimationElement::AnimatableProperties intersection;
92 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii( 100 std::insert_iterator<LayerAnimationElement::AnimatableProperties> ii(
93 intersection, intersection.begin()); 101 intersection, intersection.begin());
94 std::set_intersection(properties_.begin(), properties_.end(), 102 std::set_intersection(properties_.begin(), properties_.end(),
95 other.begin(), other.end(), 103 other.begin(), other.end(),
96 ii); 104 ii);
97 return intersection.size() > 0; 105 return intersection.size() > 0;
98 } 106 }
99 107
100 } // namespace ui 108 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698