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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp

Issue 1481123002: Use SVGLength's wrapped CSSPrimitiveValue for pres.attr. style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr 89 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
90 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) 90 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
91 return true; 91 return true;
92 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName); 92 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
93 } 93 }
94 94
95 void SVGEllipseElement::collectStyleForPresentationAttribute(const QualifiedName & name, const AtomicString& value, MutableStylePropertySet* style) 95 void SVGEllipseElement::collectStyleForPresentationAttribute(const QualifiedName & name, const AtomicString& value, MutableStylePropertySet* style)
96 { 96 {
97 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 97 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name);
98 if (property == m_cx) 98 if (property == m_cx)
99 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyCx, * m_cx->currentValue()); 99 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue());
100 else if (property == m_cy) 100 else if (property == m_cy)
101 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyCy, * m_cy->currentValue()); 101 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue());
102 else if (property == m_rx) 102 else if (property == m_rx)
103 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRx, * m_rx->currentValue()); 103 addPropertyToPresentationAttributeStyle(style, CSSPropertyRx, m_rx->curr entValue()->asCSSPrimitiveValue());
104 else if (property == m_ry) 104 else if (property == m_ry)
105 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRy, * m_ry->currentValue()); 105 addPropertyToPresentationAttributeStyle(style, CSSPropertyRy, m_ry->curr entValue()->asCSSPrimitiveValue());
106 else 106 else
107 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle); 107 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle);
108 } 108 }
109 109
110 110
111 void SVGEllipseElement::svgAttributeChanged(const QualifiedName& attrName) 111 void SVGEllipseElement::svgAttributeChanged(const QualifiedName& attrName)
112 { 112 {
113 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr 113 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
114 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) { 114 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) {
115 SVGElement::InvalidationGuard invalidationGuard(this); 115 SVGElement::InvalidationGuard invalidationGuard(this);
(...skipping 22 matching lines...) Expand all
138 || m_rx->currentValue()->isRelative() 138 || m_rx->currentValue()->isRelative()
139 || m_ry->currentValue()->isRelative(); 139 || m_ry->currentValue()->isRelative();
140 } 140 }
141 141
142 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&) 142 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&)
143 { 143 {
144 return new LayoutSVGEllipse(this); 144 return new LayoutSVGEllipse(this);
145 } 145 }
146 146
147 } // namespace blink 147 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698