| Index: third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp
|
| index 67aefb3a435deef63e18f45907a48eb0a1dc12fb..cdab08ccc23f5338afbeeaa44c1a724cfb9d5868 100644
|
| --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBool.cpp
|
| @@ -4,30 +4,12 @@
|
|
|
| #include "core/animation/animatable/AnimatableDoubleAndBool.h"
|
|
|
| -#include "platform/animation/AnimationUtilities.h"
|
|
|
| namespace blink {
|
|
|
| -bool AnimatableDoubleAndBool::usesDefaultInterpolationWith(
|
| - const AnimatableValue* value) const {
|
| - const AnimatableDoubleAndBool* other = toAnimatableDoubleAndBool(value);
|
| - return flag() != other->flag();
|
| -}
|
| -
|
| -PassRefPtr<AnimatableValue> AnimatableDoubleAndBool::interpolateTo(
|
| - const AnimatableValue* value,
|
| - double fraction) const {
|
| - const AnimatableDoubleAndBool* other = toAnimatableDoubleAndBool(value);
|
| - if (flag() == other->flag())
|
| - return AnimatableDoubleAndBool::create(
|
| - blend(m_number, other->m_number, fraction), flag());
|
| -
|
| - return defaultInterpolateTo(this, value, fraction);
|
| -}
|
| -
|
| bool AnimatableDoubleAndBool::equalTo(const AnimatableValue* value) const {
|
| const AnimatableDoubleAndBool* other = toAnimatableDoubleAndBool(value);
|
| - return toDouble() == other->toDouble() && flag() == other->flag();
|
| + return m_number == other->m_number && m_flag == other->m_flag;
|
| }
|
|
|
| } // namespace blink
|
|
|