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

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

Issue 1713513002: Rename -webkit-text to -internal-quirk-inherit, limiting it to UA style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; add new (negative) test 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
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 d245e36a682a54db0608c94bea44016fee1264f3..70300df471f323c3a9f8dc0364305cf5190b999c 100644
--- a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
@@ -19,7 +19,7 @@ enum InterpolableColorIndex {
Currentcolor,
WebkitActivelink,
WebkitLink,
- WebkitText,
+ QuirkInherit,
InterpolableColorIndexCount,
};
@@ -42,7 +42,7 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor
list->set(Currentcolor, InterpolableNumber::create(0));
list->set(WebkitActivelink, InterpolableNumber::create(0));
list->set(WebkitLink, InterpolableNumber::create(0));
- list->set(WebkitText, InterpolableNumber::create(0));
+ list->set(QuirkInherit, InterpolableNumber::create(0));
return list.release();
}
@@ -55,8 +55,8 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor
return createInterpolableColorForIndex(WebkitActivelink);
case CSSValueWebkitLink:
return createInterpolableColorForIndex(WebkitLink);
- case CSSValueWebkitText:
- return createInterpolableColorForIndex(WebkitText);
+ case CSSValueInternalQuirkInherit:
+ return createInterpolableColorForIndex(QuirkInherit);
case CSSValueWebkitFocusRingColor:
return createInterpolableColor(LayoutTheme::theme().focusRingColor());
default:
@@ -119,8 +119,8 @@ Color CSSColorInterpolationType::resolveInterpolableColor(const InterpolableValu
addPremultipliedColor(red, green, blue, alpha, webkitActivelinkFraction, colors.activeLinkColor());
if (double webkitLinkFraction = toInterpolableNumber(list.get(WebkitLink))->value())
addPremultipliedColor(red, green, blue, alpha, webkitLinkFraction, isVisited ? colors.visitedLinkColor() : colors.linkColor());
- if (double webkitTextFraction = toInterpolableNumber(list.get(WebkitText))->value())
- addPremultipliedColor(red, green, blue, alpha, webkitTextFraction, colors.textColor());
+ if (double quirkInheritFraction = toInterpolableNumber(list.get(QuirkInherit))->value())
+ addPremultipliedColor(red, green, blue, alpha, quirkInheritFraction, colors.textColor());
alpha = clampTo<double>(alpha, 0, 255);
if (alpha == 0)

Powered by Google App Engine
This is Rietveld 408576698