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

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 16337002: Revert "Revert "Implement CSS3TextDecorations runtime flag in favor of CSS3_TEXT"" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 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 | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index fb211b88f2b49934cfb7581e51e6c98702595bdd..012016f063f344d3d06cee9f3ef5b451a32d6de3 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -2796,12 +2796,10 @@ bool RenderObject::hasBlendMode() const
static Color decorationColor(RenderStyle* style)
{
Color result;
-#if ENABLE(CSS3_TEXT)
// Check for text decoration color first.
- result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor);
+ result = style->visitedDependentColor(CSSPropertyTextDecorationColor);
if (result.isValid())
return result;
-#endif // CSS3_TEXT
if (style->textStrokeWidth() > 0) {
// Prefer stroke color if possible but not if it's fully transparent.
result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698