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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/compositor/layer_animation_sequence.cc
diff --git a/ui/gfx/compositor/layer_animation_sequence.cc b/ui/gfx/compositor/layer_animation_sequence.cc
index f0deca6a71d74f0e8d2e5474625f2cf4edb1933e..8f34969d6801439cc6cc3e639da280662bec38e0 100644
--- a/ui/gfx/compositor/layer_animation_sequence.cc
+++ b/ui/gfx/compositor/layer_animation_sequence.cc
@@ -29,7 +29,6 @@ LayerAnimationSequence::~LayerAnimationSequence() {
void LayerAnimationSequence::Progress(base::TimeDelta elapsed,
LayerAnimationDelegate* delegate) {
- TRACE_EVENT0("LayerAnimationSequence", "Progress");
if (elements_.size() == 0 || duration_ == base::TimeDelta())
return;
@@ -69,6 +68,15 @@ void LayerAnimationSequence::Progress(base::TimeDelta elapsed,
}
}
+void LayerAnimationSequence::GetTargetValue(
+ LayerAnimationElement::TargetValue* target) const {
+ if (is_cyclic_)
+ return;
+
+ for (size_t i = last_element_; i < elements_.size(); ++i)
+ elements_[i]->GetTargetValue(target);
+}
+
void LayerAnimationSequence::Abort() {
size_t current_index = last_element_ % elements_.size();
while (current_index < elements_.size()) {
« 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