| OLD | NEW |
| 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 2783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2794 } | 2794 } |
| 2795 | 2795 |
| 2796 bool RenderObject::hasBlendMode() const | 2796 bool RenderObject::hasBlendMode() const |
| 2797 { | 2797 { |
| 2798 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style()
->hasBlendMode(); | 2798 return RuntimeEnabledFeatures::cssCompositingEnabled() && style() && style()
->hasBlendMode(); |
| 2799 } | 2799 } |
| 2800 | 2800 |
| 2801 static Color decorationColor(RenderStyle* style) | 2801 static Color decorationColor(RenderStyle* style) |
| 2802 { | 2802 { |
| 2803 Color result; | 2803 Color result; |
| 2804 #if ENABLE(CSS3_TEXT) | |
| 2805 // Check for text decoration color first. | 2804 // Check for text decoration color first. |
| 2806 result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor); | 2805 result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor); |
| 2807 if (result.isValid()) | 2806 if (result.isValid()) |
| 2808 return result; | 2807 return result; |
| 2809 #endif // CSS3_TEXT | |
| 2810 if (style->textStrokeWidth() > 0) { | 2808 if (style->textStrokeWidth() > 0) { |
| 2811 // Prefer stroke color if possible but not if it's fully transparent. | 2809 // Prefer stroke color if possible but not if it's fully transparent. |
| 2812 result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor); | 2810 result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor); |
| 2813 if (result.alpha()) | 2811 if (result.alpha()) |
| 2814 return result; | 2812 return result; |
| 2815 } | 2813 } |
| 2816 | 2814 |
| 2817 result = style->visitedDependentColor(CSSPropertyWebkitTextFillColor); | 2815 result = style->visitedDependentColor(CSSPropertyWebkitTextFillColor); |
| 2818 return result; | 2816 return result; |
| 2819 } | 2817 } |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3190 { | 3188 { |
| 3191 if (object1) { | 3189 if (object1) { |
| 3192 const WebCore::RenderObject* root = object1; | 3190 const WebCore::RenderObject* root = object1; |
| 3193 while (root->parent()) | 3191 while (root->parent()) |
| 3194 root = root->parent(); | 3192 root = root->parent(); |
| 3195 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3193 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3196 } | 3194 } |
| 3197 } | 3195 } |
| 3198 | 3196 |
| 3199 #endif | 3197 #endif |
| OLD | NEW |