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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGCircleElement.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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr 80 if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
81 || attrName == SVGNames::rAttr) 81 || attrName == SVGNames::rAttr)
82 return true; 82 return true;
83 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName); 83 return SVGGeometryElement::isPresentationAttributeWithSVGDOM(attrName);
84 } 84 }
85 85
86 void SVGCircleElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style) 86 void SVGCircleElement::collectStyleForPresentationAttribute(const QualifiedName& name, const AtomicString& value, MutableStylePropertySet* style)
87 { 87 {
88 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 88 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name);
89 if (property == m_cx) 89 if (property == m_cx)
90 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyCx, * m_cx->currentValue()); 90 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx, m_cx->curr entValue()->asCSSPrimitiveValue());
91 else if (property == m_cy) 91 else if (property == m_cy)
92 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyCy, * m_cy->currentValue()); 92 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy, m_cy->curr entValue()->asCSSPrimitiveValue());
93 else if (property == m_r) 93 else if (property == m_r)
94 addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyR, *m _r->currentValue()); 94 addPropertyToPresentationAttributeStyle(style, CSSPropertyR, m_r->curren tValue()->asCSSPrimitiveValue());
95 else 95 else
96 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle); 96 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, st yle);
97 } 97 }
98 98
99 void SVGCircleElement::svgAttributeChanged(const QualifiedName& attrName) 99 void SVGCircleElement::svgAttributeChanged(const QualifiedName& attrName)
100 { 100 {
101 if (attrName == SVGNames::rAttr 101 if (attrName == SVGNames::rAttr
102 || attrName == SVGNames::cxAttr 102 || attrName == SVGNames::cxAttr
103 || attrName == SVGNames::cyAttr) { 103 || attrName == SVGNames::cyAttr) {
104 SVGElement::InvalidationGuard invalidationGuard(this); 104 SVGElement::InvalidationGuard invalidationGuard(this);
(...skipping 21 matching lines...) Expand all
126 || m_cy->currentValue()->isRelative() 126 || m_cy->currentValue()->isRelative()
127 || m_r->currentValue()->isRelative(); 127 || m_r->currentValue()->isRelative();
128 } 128 }
129 129
130 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) 130 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&)
131 { 131 {
132 return new LayoutSVGEllipse(this); 132 return new LayoutSVGEllipse(this);
133 } 133 }
134 134
135 } 135 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Element.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