| Index: third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
|
| index f0bb4860b9468d7ca7571e2613666351ff682c5b..399130b5962f85bbc656335d28ff115ee5bc9815 100644
|
| --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableVisibility.cpp
|
| @@ -36,20 +36,20 @@ bool AnimatableVisibility::usesDefaultInterpolationWith(const AnimatableValue* v
|
| {
|
| EVisibility from = m_visibility;
|
| EVisibility to = toAnimatableVisibility(value)->m_visibility;
|
| - return from != VISIBLE && to != VISIBLE;
|
| + return from != EVisibility::Visible && to != EVisibility::Visible;
|
| }
|
|
|
| PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const AnimatableValue* value, double fraction) const
|
| {
|
| EVisibility from = m_visibility;
|
| EVisibility to = toAnimatableVisibility(value)->m_visibility;
|
| - if (from != VISIBLE && to != VISIBLE)
|
| + if (from != EVisibility::Visible && to != EVisibility::Visible)
|
| return defaultInterpolateTo(this, value, fraction);
|
| if (fraction <= 0)
|
| return takeConstRef(this);
|
| if (fraction >= 1)
|
| return takeConstRef(value);
|
| - return takeConstRef(from == VISIBLE ? this : value);
|
| + return takeConstRef(from == EVisibility::Visible ? this : value);
|
| }
|
|
|
| bool AnimatableVisibility::equalTo(const AnimatableValue* value) const
|
|
|