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

Side by Side Diff: Source/core/svg/SVGSVGElement.cpp

Issue 651353004: SVGElement::parseAttribute resolves property via property map (Step 2.5) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git/+/master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/svg/SVGMarkerElement.cpp ('k') | Source/core/svg/SVGTextPositioningElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2014 Google, Inc. 5 * Copyright (C) 2014 Google, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } 203 }
204 204
205 void SVGSVGElement::updateCurrentTranslate() 205 void SVGSVGElement::updateCurrentTranslate()
206 { 206 {
207 if (RenderObject* object = renderer()) 207 if (RenderObject* object = renderer())
208 object->setNeedsLayoutAndFullPaintInvalidation(); 208 object->setNeedsLayoutAndFullPaintInvalidation();
209 } 209 }
210 210
211 void SVGSVGElement::parseAttribute(const QualifiedName& name, const AtomicString & value) 211 void SVGSVGElement::parseAttribute(const QualifiedName& name, const AtomicString & value)
212 { 212 {
213 SVGParsingError parseError = NoError;
214
215 if (!nearestViewportElement()) { 213 if (!nearestViewportElement()) {
216 bool setListener = true; 214 bool setListener = true;
217 215
218 // Only handle events if we're the outermost <svg> element 216 // Only handle events if we're the outermost <svg> element
219 if (name == HTMLNames::onunloadAttr) 217 if (name == HTMLNames::onunloadAttr)
220 document().setWindowAttributeEventListener(EventTypeNames::unload, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( ))); 218 document().setWindowAttributeEventListener(EventTypeNames::unload, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( )));
221 else if (name == HTMLNames::onresizeAttr) 219 else if (name == HTMLNames::onresizeAttr)
222 document().setWindowAttributeEventListener(EventTypeNames::resize, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( ))); 220 document().setWindowAttributeEventListener(EventTypeNames::resize, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( )));
223 else if (name == HTMLNames::onscrollAttr) 221 else if (name == HTMLNames::onscrollAttr)
224 document().setWindowAttributeEventListener(EventTypeNames::scroll, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( ))); 222 document().setWindowAttributeEventListener(EventTypeNames::scroll, c reateAttributeEventListener(document().frame(), name, value, eventParameterName( )));
225 else if (name == SVGNames::onzoomAttr) 223 else if (name == SVGNames::onzoomAttr)
226 document().setWindowAttributeEventListener(EventTypeNames::zoom, cre ateAttributeEventListener(document().frame(), name, value, eventParameterName()) ); 224 document().setWindowAttributeEventListener(EventTypeNames::zoom, cre ateAttributeEventListener(document().frame(), name, value, eventParameterName()) );
227 else 225 else
228 setListener = false; 226 setListener = false;
229 227
230 if (setListener) 228 if (setListener)
231 return; 229 return;
232 } 230 }
233 231
234 if (name == HTMLNames::onabortAttr) { 232 if (name == HTMLNames::onabortAttr) {
235 document().setWindowAttributeEventListener(EventTypeNames::abort, create AttributeEventListener(document().frame(), name, value, eventParameterName())); 233 document().setWindowAttributeEventListener(EventTypeNames::abort, create AttributeEventListener(document().frame(), name, value, eventParameterName()));
236 } else if (name == HTMLNames::onerrorAttr) { 234 } else if (name == HTMLNames::onerrorAttr) {
237 document().setWindowAttributeEventListener(EventTypeNames::error, create AttributeEventListener(document().frame(), name, value, eventParameterName())); 235 document().setWindowAttributeEventListener(EventTypeNames::error, create AttributeEventListener(document().frame(), name, value, eventParameterName()));
238 } else if (name == SVGNames::xAttr) {
239 m_x->setBaseValueAsString(value, parseError);
240 } else if (name == SVGNames::yAttr) {
241 m_y->setBaseValueAsString(value, parseError);
242 } else if (name == SVGNames::widthAttr) {
243 m_width->setBaseValueAsString(value, parseError);
244 } else if (name == SVGNames::heightAttr) {
245 m_height->setBaseValueAsString(value, parseError);
246 } else if (SVGFitToViewBox::parseAttribute(name, value, document(), parseErr or)) {
247 } else if (SVGZoomAndPan::parseAttribute(name, value)) { 236 } else if (SVGZoomAndPan::parseAttribute(name, value)) {
248 } else { 237 } else {
249 SVGGraphicsElement::parseAttribute(name, value); 238 parseAttributeNew(name, value);
250 } 239 }
251
252 reportAttributeParsingError(parseError, name, value);
253 } 240 }
254 241
255 bool SVGSVGElement::isPresentationAttribute(const QualifiedName& name) const 242 bool SVGSVGElement::isPresentationAttribute(const QualifiedName& name) const
256 { 243 {
257 if (isOutermostSVGSVGElement() && (name == SVGNames::widthAttr || name == SV GNames::heightAttr)) 244 if (isOutermostSVGSVGElement() && (name == SVGNames::widthAttr || name == SV GNames::heightAttr))
258 return true; 245 return true;
259 return SVGGraphicsElement::isPresentationAttribute(name); 246 return SVGGraphicsElement::isPresentationAttribute(name);
260 } 247 }
261 248
262 void SVGSVGElement::collectStyleForPresentationAttribute(const QualifiedName& na me, const AtomicString& value, MutableStylePropertySet* style) 249 void SVGSVGElement::collectStyleForPresentationAttribute(const QualifiedName& na me, const AtomicString& value, MutableStylePropertySet* style)
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 } 759 }
773 760
774 void SVGSVGElement::trace(Visitor* visitor) 761 void SVGSVGElement::trace(Visitor* visitor)
775 { 762 {
776 visitor->trace(m_timeContainer); 763 visitor->trace(m_timeContainer);
777 visitor->trace(m_viewSpec); 764 visitor->trace(m_viewSpec);
778 SVGGraphicsElement::trace(visitor); 765 SVGGraphicsElement::trace(visitor);
779 } 766 }
780 767
781 } // namespace blink 768 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/SVGMarkerElement.cpp ('k') | Source/core/svg/SVGTextPositioningElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698