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

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

Issue 2549563002: Only communicate CSSPrimitiveValue references from SVGLength (Closed)
Patch Set: Created 4 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 } 75 }
76 76
77 return path; 77 return path;
78 } 78 }
79 79
80 void SVGCircleElement::collectStyleForPresentationAttribute( 80 void SVGCircleElement::collectStyleForPresentationAttribute(
81 const QualifiedName& name, 81 const QualifiedName& name,
82 const AtomicString& value, 82 const AtomicString& value,
83 MutableStylePropertySet* style) { 83 MutableStylePropertySet* style) {
84 SVGAnimatedPropertyBase* property = propertyFromAttribute(name); 84 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
85 if (property == m_cx) 85 if (property == m_cx) {
86 addPropertyToPresentationAttributeStyle( 86 addPropertyToPresentationAttributeStyle(style, CSSPropertyCx,
87 style, CSSPropertyCx, m_cx->currentValue()->asCSSPrimitiveValue()); 87 m_cx->cssValue());
88 else if (property == m_cy) 88 } else if (property == m_cy) {
89 addPropertyToPresentationAttributeStyle( 89 addPropertyToPresentationAttributeStyle(style, CSSPropertyCy,
90 style, CSSPropertyCy, m_cy->currentValue()->asCSSPrimitiveValue()); 90 m_cy->cssValue());
91 else if (property == m_r) 91 } else if (property == m_r) {
92 addPropertyToPresentationAttributeStyle( 92 addPropertyToPresentationAttributeStyle(style, CSSPropertyR,
93 style, CSSPropertyR, m_r->currentValue()->asCSSPrimitiveValue()); 93 m_r->cssValue());
94 else 94 } else {
95 SVGGeometryElement::collectStyleForPresentationAttribute(name, value, 95 SVGGeometryElement::collectStyleForPresentationAttribute(name, value,
96 style); 96 style);
97 }
97 } 98 }
98 99
99 void SVGCircleElement::svgAttributeChanged(const QualifiedName& attrName) { 100 void SVGCircleElement::svgAttributeChanged(const QualifiedName& attrName) {
100 if (attrName == SVGNames::rAttr || attrName == SVGNames::cxAttr || 101 if (attrName == SVGNames::rAttr || attrName == SVGNames::cxAttr ||
101 attrName == SVGNames::cyAttr) { 102 attrName == SVGNames::cyAttr) {
102 SVGElement::InvalidationGuard invalidationGuard(this); 103 SVGElement::InvalidationGuard invalidationGuard(this);
103 104
104 invalidateSVGPresentationAttributeStyle(); 105 invalidateSVGPresentationAttributeStyle();
105 setNeedsStyleRecalc(LocalStyleChange, 106 setNeedsStyleRecalc(LocalStyleChange,
106 StyleChangeReasonForTracing::fromAttribute(attrName)); 107 StyleChangeReasonForTracing::fromAttribute(attrName));
(...skipping 15 matching lines...) Expand all
122 return m_cx->currentValue()->isRelative() || 123 return m_cx->currentValue()->isRelative() ||
123 m_cy->currentValue()->isRelative() || 124 m_cy->currentValue()->isRelative() ||
124 m_r->currentValue()->isRelative(); 125 m_r->currentValue()->isRelative();
125 } 126 }
126 127
127 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) { 128 LayoutObject* SVGCircleElement::createLayoutObject(const ComputedStyle&) {
128 return new LayoutSVGEllipse(this); 129 return new LayoutSVGEllipse(this);
129 } 130 }
130 131
131 } // namespace blink 132 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGAnimatedLength.h ('k') | third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698