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

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

Issue 1541923002: Make SVGElement::propertyFromAttribute return raw pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 bool SVGEllipseElement::isPresentationAttributeWithSVGDOM(const QualifiedName& a ttrName) const 86 bool SVGEllipseElement::isPresentationAttributeWithSVGDOM(const QualifiedName& a ttrName) const
87 { 87 {
88 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr 88 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
89 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) 89 || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
90 return true; 90 return true;
91 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName); 91 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
92 } 92 }
93 93
94 void SVGEllipseElement::collectStyleForPresentationAttribute(const QualifiedName & name, const AtomicString& value, MutableStylePropertySet* style) 94 void SVGEllipseElement::collectStyleForPresentationAttribute(const QualifiedName & name, const AtomicString& value, MutableStylePropertySet* style)
95 { 95 {
96 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 96 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
97 if (property == m_cx) 97 if (property == m_cx)
98 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue()); 98 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue());
99 else if (property == m_cy) 99 else if (property == m_cy)
100 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue()); 100 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue());
101 else if (property == m_rx) 101 else if (property == m_rx)
102 addPropertyToPresentationAttributeStyle(style, CSSPropertyRx, m_rx->curr entValue()->asCSSPrimitiveValue()); 102 addPropertyToPresentationAttributeStyle(style, CSSPropertyRx, m_rx->curr entValue()->asCSSPrimitiveValue());
103 else if (property == m_ry) 103 else if (property == m_ry)
104 addPropertyToPresentationAttributeStyle(style, CSSPropertyRy, m_ry->curr entValue()->asCSSPrimitiveValue()); 104 addPropertyToPresentationAttributeStyle(style, CSSPropertyRy, m_ry->curr entValue()->asCSSPrimitiveValue());
105 else 105 else
106 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle); 106 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle);
(...skipping 30 matching lines...) Expand all
137 || m_rx->currentValue()->isRelative() 137 || m_rx->currentValue()->isRelative()
138 || m_ry->currentValue()->isRelative(); 138 || m_ry->currentValue()->isRelative();
139 } 139 }
140 140
141 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&) 141 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&)
142 { 142 {
143 return new LayoutSVGEllipse(this); 143 return new LayoutSVGEllipse(this);
144 } 144 }
145 145
146 } // namespace blink 146 } // 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