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

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

Issue 1224223003: Fold CSSParser::colorFromRGBColorString into only user (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGAnimatedColor.h ('k') | Source/core/svg/SVGAnimatedTypeAnimator.cpp » ('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) 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "config.h" 20 #include "config.h"
21
22 #include "core/svg/SVGAnimatedColor.h" 21 #include "core/svg/SVGAnimatedColor.h"
23 22
23 #include "core/css/parser/CSSParser.h"
24 #include "core/layout/LayoutObject.h" 24 #include "core/layout/LayoutObject.h"
25 #include "core/svg/ColorDistance.h" 25 #include "core/svg/ColorDistance.h"
26 #include "core/svg/SVGAnimateElement.h" 26 #include "core/svg/SVGAnimateElement.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 SVGColorProperty::SVGColorProperty(const String& colorString)
31 : SVGPropertyBase(classType())
32 , m_styleColor(StyleColor::currentColor())
33 {
34 RGBA32 color;
35 if (CSSParser::parseColor(color, colorString.stripWhiteSpace()))
36 m_styleColor = StyleColor(color);
37 }
38
30 String SVGColorProperty::valueAsString() const 39 String SVGColorProperty::valueAsString() const
31 { 40 {
32 return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.color() .serializedAsCSSComponentValue(); 41 return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.color() .serializedAsCSSComponentValue();
33 } 42 }
34 43
35 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGColorProperty::cloneForAnimation(cons t String&) const 44 PassRefPtrWillBeRawPtr<SVGPropertyBase> SVGColorProperty::cloneForAnimation(cons t String&) const
36 { 45 {
37 // SVGAnimatedColor is deprecated. So No SVG DOM animation. 46 // SVGAnimatedColor is deprecated. So No SVG DOM animation.
38 ASSERT_NOT_REACHED(); 47 ASSERT_NOT_REACHED();
39 return nullptr; 48 return nullptr;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 { 100 {
92 ASSERT(contextElement); 101 ASSERT(contextElement);
93 Color fallbackColor = fallbackColorForCurrentColor(contextElement); 102 Color fallbackColor = fallbackColorForCurrentColor(contextElement);
94 103
95 Color fromColor = m_styleColor.resolve(fallbackColor); 104 Color fromColor = m_styleColor.resolve(fallbackColor);
96 Color toColor = toSVGColorProperty(toValue)->m_styleColor.resolve(fallbackCo lor); 105 Color toColor = toSVGColorProperty(toValue)->m_styleColor.resolve(fallbackCo lor);
97 return ColorDistance::distance(fromColor, toColor); 106 return ColorDistance::distance(fromColor, toColor);
98 } 107 }
99 108
100 } 109 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAnimatedColor.h ('k') | Source/core/svg/SVGAnimatedTypeAnimator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698