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

Unified Diff: ui/compositor/layer_animator.cc

Issue 12226080: Thread ui transform animations (Closed) Base URL: http://git.chromium.org/chromium/src.git@DefineThreadedLayerAnimationElements
Patch Set: Speed up animations in WebContentsViewAuraTest.QuickOverscrollDirectionChange Created 7 years, 9 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/compositor/layer_animator.cc
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index 52d6805d1f715634c9a5ec6828f46b3274f59cf5..c845034d464f650a24b274d61b89d8934382b4fb 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -582,7 +582,7 @@ void LayerAnimator::RemoveAllAnimationsWithACommonProperty(
if (!SAFE_INVOKE_BOOL(HasAnimation, running_animations_copy[i]))
continue;
- if (running_animations_copy[i].sequence()->HasCommonProperty(
+ if (running_animations_copy[i].sequence()->HasConflictingProperty(
sequence->properties())) {
scoped_ptr<LayerAnimationSequence> removed(
SAFE_INVOKE_PTR(RemoveAnimation, running_animations_copy[i]));
@@ -604,7 +604,7 @@ void LayerAnimator::RemoveAllAnimationsWithACommonProperty(
if (!sequences[i] || !HasAnimation(sequences[i]))
continue;
- if (sequences[i]->HasCommonProperty(sequence->properties())) {
+ if (sequences[i]->HasConflictingProperty(sequence->properties())) {
scoped_ptr<LayerAnimationSequence> removed(RemoveAnimation(sequences[i]));
if (abort)
sequences[i]->Abort(delegate());
@@ -722,7 +722,7 @@ void LayerAnimator::ProcessQueue() {
if (!sequences[i] || !HasAnimation(sequences[i]))
continue;
- if (!sequences[i]->HasCommonProperty(animated)) {
+ if (!sequences[i]->HasConflictingProperty(animated)) {
StartSequenceImmediately(sequences[i].get());
started_sequence = true;
break;
@@ -750,7 +750,7 @@ bool LayerAnimator::StartSequenceImmediately(LayerAnimationSequence* sequence) {
// Ensure that no one is animating one of the sequence's properties already.
for (RunningAnimations::const_iterator iter = running_animations_.begin();
iter != running_animations_.end(); ++iter) {
- if ((*iter).sequence()->HasCommonProperty(sequence->properties()))
+ if ((*iter).sequence()->HasConflictingProperty(sequence->properties()))
return false;
}
« no previous file with comments | « ui/compositor/layer_animation_sequence_unittest.cc ('k') | ui/compositor/test/layer_animator_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698