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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGCircleElement.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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 bool SVGCircleElement::isPresentationAttributeWithSVGDOM(const QualifiedName& at trName) const 77 bool SVGCircleElement::isPresentationAttributeWithSVGDOM(const QualifiedName& at trName) const
78 { 78 {
79 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr 79 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
80 || attrName == SVGNames::rAttr) 80 || attrName == SVGNames::rAttr)
81 return true; 81 return true;
82 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName); 82 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
83 } 83 }
84 84
85 void SVGCircleElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style) 85 void SVGCircleElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
86 { 86 {
87 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 87 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
88 if (property == m_cx) 88 if (property == m_cx)
89 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue()); 89 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue());
90 else if (property == m_cy) 90 else if (property == m_cy)
91 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue()); 91 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue());
92 else if (property == m_r) 92 else if (property == m_r)
93 addPropertyToPresentationAttributeStyle(style, CSSPropertyR, m_r->curren tValue()->asCSSPrimitiveValue()); 93 addPropertyToPresentationAttributeStyle(style, CSSPropertyR, m_r->curren tValue()->asCSSPrimitiveValue());
94 else 94 else
95 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle); 95 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle);
96 } 96 }
97 97
(...skipping 27 matching lines...) Expand all
125 || m_cy->currentValue()->isRelative() 125 || m_cy->currentValue()->isRelative()
126 || m_r->currentValue()->isRelative(); 126 || m_r->currentValue()->isRelative();
127 } 127 }
128 128
129 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) 129 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&)
130 { 130 {
131 return new LayoutSVGEllipse(this); 131 return new LayoutSVGEllipse(this);
132 } 132 }
133 133
134 } 134 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.cpp ('k') | third_party/WebKit/Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698