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

Side by Side Diff: Source/core/svg/SVGAnimatedColor.cpp

Issue 750333004: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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/svg/SVGRenderTreeAsText.cpp ('k') | no next file » | 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) Research In Motion Limited 2011. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 25 matching lines...) Expand all
36 { 36 {
37 // SVGAnimatedColor is deprecated. So No SVG DOM animation. 37 // SVGAnimatedColor is deprecated. So No SVG DOM animation.
38 ASSERT_NOT_REACHED(); 38 ASSERT_NOT_REACHED();
39 return nullptr; 39 return nullptr;
40 } 40 }
41 41
42 static inline Color fallbackColorForCurrentColor(SVGElement* targetElement) 42 static inline Color fallbackColorForCurrentColor(SVGElement* targetElement)
43 { 43 {
44 ASSERT(targetElement); 44 ASSERT(targetElement);
45 if (RenderObject* targetRenderer = targetElement->renderer()) 45 if (RenderObject* targetRenderer = targetElement->renderer())
46 return targetRenderer->style()->visitedDependentColor(CSSPropertyColor); 46 return targetRenderer->resolveColor(CSSPropertyColor);
47 else 47 else
48 return Color::transparent; 48 return Color::transparent;
49 } 49 }
50 50
51 void SVGColorProperty::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGEle ment* contextElement) 51 void SVGColorProperty::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGEle ment* contextElement)
52 { 52 {
53 ASSERT(contextElement); 53 ASSERT(contextElement);
54 54
55 Color fallbackColor = fallbackColorForCurrentColor(contextElement); 55 Color fallbackColor = fallbackColorForCurrentColor(contextElement);
56 Color fromColor = toSVGColorProperty(other)->m_styleColor.resolve(fallbackCo lor); 56 Color fromColor = toSVGColorProperty(other)->m_styleColor.resolve(fallbackCo lor);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 { 92 {
93 ASSERT(contextElement); 93 ASSERT(contextElement);
94 Color fallbackColor = fallbackColorForCurrentColor(contextElement); 94 Color fallbackColor = fallbackColorForCurrentColor(contextElement);
95 95
96 Color fromColor = m_styleColor.resolve(fallbackColor); 96 Color fromColor = m_styleColor.resolve(fallbackColor);
97 Color toColor = toSVGColorProperty(toValue)->m_styleColor.resolve(fallbackCo lor); 97 Color toColor = toSVGColorProperty(toValue)->m_styleColor.resolve(fallbackCo lor);
98 return ColorDistance::distance(fromColor, toColor); 98 return ColorDistance::distance(fromColor, toColor);
99 } 99 }
100 100
101 } 101 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGRenderTreeAsText.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698