| Index: third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp
|
| index 6e29ab6b1e5b3840f903ca5ff32060c096e614e0..31d125defe926fbe9e3017952acd99f98d66bb6b 100644
|
| --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableFilterOperations.cpp
|
| @@ -34,21 +34,15 @@
|
|
|
| namespace blink {
|
|
|
| -bool AnimatableFilterOperations::UsesDefaultInterpolationWith(
|
| - const AnimatableValue* value) const {
|
| - const AnimatableFilterOperations* target =
|
| - ToAnimatableFilterOperations(value);
|
| - return !Operations().CanInterpolateWith(target->Operations());
|
| -}
|
| -
|
| PassRefPtr<AnimatableValue> AnimatableFilterOperations::InterpolateTo(
|
| const AnimatableValue* value,
|
| double fraction) const {
|
| - if (UsesDefaultInterpolationWith(value))
|
| - return DefaultInterpolateTo(this, value, fraction);
|
| -
|
| const AnimatableFilterOperations* target =
|
| ToAnimatableFilterOperations(value);
|
| +
|
| + if (!Operations().CanInterpolateWith(target->Operations()))
|
| + return DefaultInterpolateTo(this, value, fraction);
|
| +
|
| FilterOperations result;
|
| size_t from_size = Operations().size();
|
| size_t to_size = target->Operations().size();
|
| @@ -70,8 +64,4 @@ PassRefPtr<AnimatableValue> AnimatableFilterOperations::InterpolateTo(
|
| return AnimatableFilterOperations::Create(result);
|
| }
|
|
|
| -bool AnimatableFilterOperations::EqualTo(const AnimatableValue* value) const {
|
| - return Operations() == ToAnimatableFilterOperations(value)->Operations();
|
| -}
|
| -
|
| } // namespace blink
|
|
|