| Index: ui/compositor/layer_animation_sequence.h
|
| diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h
|
| index 6f7c96e7438cef4b5a1156a73ea03f26fe22d8b8..2f2e405ef36db7668a4fc2abd37442c6fcfb6cfd 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.
|
|
|