Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-3: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSFontFace.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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())
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSFontFace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698