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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2789 } 2789 }
2790 2790
2791 bool RenderObject::hasBlendMode() const 2791 bool RenderObject::hasBlendMode() const
2792 { 2792 {
2793 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasBlendMode(); 2793 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style() ->hasBlendMode();
2794 } 2794 }
2795 2795
2796 static Color decorationColor(RenderStyle* style) 2796 static Color decorationColor(RenderStyle* style)
2797 { 2797 {
2798 Color result; 2798 Color result;
2799 #if ENABLE(CSS3_TEXT)
2800 // Check for text decoration color first. 2799 // Check for text decoration color first.
2801 result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor); 2800 result = style->visitedDependentColor(CSSPropertyTextDecorationColor);
2802 if (result.isValid()) 2801 if (result.isValid())
2803 return result; 2802 return result;
2804 #endif // CSS3_TEXT
2805 if (style->textStrokeWidth() > 0) { 2803 if (style->textStrokeWidth() > 0) {
2806 // Prefer stroke color if possible but not if it's fully transparent. 2804 // Prefer stroke color if possible but not if it's fully transparent.
2807 result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor); 2805 result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
2808 if (result.alpha()) 2806 if (result.alpha())
2809 return result; 2807 return result;
2810 } 2808 }
2811 2809
2812 result = style->visitedDependentColor(CSSPropertyWebkitTextFillColor); 2810 result = style->visitedDependentColor(CSSPropertyWebkitTextFillColor);
2813 return result; 2811 return result;
2814 } 2812 }
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
3182 { 3180 {
3183 if (object1) { 3181 if (object1) {
3184 const WebCore::RenderObject* root = object1; 3182 const WebCore::RenderObject* root = object1;
3185 while (root->parent()) 3183 while (root->parent())
3186 root = root->parent(); 3184 root = root->parent();
3187 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3185 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3188 } 3186 }
3189 } 3187 }
3190 3188
3191 #endif 3189 #endif
OLDNEW
« 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