Index: ui/compositor/layer_animation_sequence.h |
diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h |
index 30e4f73371d237f464cc90a0ac803ff579ebb4b3..26e5ddcfe64f2a1284be03de34f9f95d89ed512a 100644 |
--- a/ui/compositor/layer_animation_sequence.h |
+++ b/ui/compositor/layer_animation_sequence.h |
@@ -93,9 +93,9 @@ class COMPOSITOR_EXPORT LayerAnimationSequence |
void set_is_cyclic(bool is_cyclic) { is_cyclic_ = is_cyclic; } |
bool is_cyclic() const { return is_cyclic_; } |
- // Returns true if this sequence has at least one element affecting a |
+ // Returns true if this sequence has at least one element conflicting with a |
// property in |other|. |
- bool HasCommonProperty( |
+ bool HasConflictingProperty( |
const LayerAnimationElement::AnimatableProperties& other) const; |
// Returns true if the first element animates on the compositor thread. |