| Index: third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| index 70300df471f323c3a9f8dc0364305cf5190b999c..eb51dfdf2a1c131e2e16ab0db83d373023df9432 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| @@ -69,7 +69,7 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor
|
| {
|
| if (color.isCurrentColor())
|
| return createInterpolableColorForIndex(Currentcolor);
|
| - return createInterpolableColor(color.color());
|
| + return createInterpolableColor(color.getColor());
|
| }
|
|
|
| PassOwnPtr<InterpolableValue> CSSColorInterpolationType::maybeCreateInterpolableColor(const CSSValue& value)
|
| @@ -112,7 +112,7 @@ Color CSSColorInterpolationType::resolveInterpolableColor(const InterpolableValu
|
| currentStyleColor = currentColorGetter(CSSPropertyWebkitTextFillColor, *state.style());
|
| if (currentStyleColor.isCurrentColor())
|
| currentStyleColor = currentColorGetter(CSSPropertyColor, *state.style());
|
| - addPremultipliedColor(red, green, blue, alpha, currentcolorFraction, currentStyleColor.color());
|
| + addPremultipliedColor(red, green, blue, alpha, currentcolorFraction, currentStyleColor.getColor());
|
| }
|
| const TextLinkColors& colors = state.document().textLinkColors();
|
| if (double webkitActivelinkFraction = toInterpolableNumber(list.get(WebkitActivelink))->value())
|
|
|