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

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

Issue 2708923011: Avoid duplicating the CSS property mapping for SVG pres. attrs. (Closed)
Patch Set: Created 3 years, 9 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 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 return false; 223 return false;
224 return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName); 224 return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName);
225 } 225 }
226 226
227 void SVGSVGElement::collectStyleForPresentationAttribute( 227 void SVGSVGElement::collectStyleForPresentationAttribute(
228 const QualifiedName& name, 228 const QualifiedName& name,
229 const AtomicString& value, 229 const AtomicString& value,
230 MutableStylePropertySet* style) { 230 MutableStylePropertySet* style) {
231 SVGAnimatedPropertyBase* property = propertyFromAttribute(name); 231 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
232 if (property == m_x) { 232 if (property == m_x) {
233 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, 233 addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
234 m_x->cssValue()); 234 m_x->cssValue());
235 } else if (property == m_y) { 235 } else if (property == m_y) {
236 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, 236 addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
237 m_y->cssValue()); 237 m_y->cssValue());
238 } else if (isOutermostSVGSVGElement() && 238 } else if (isOutermostSVGSVGElement() &&
239 (property == m_width || property == m_height)) { 239 (property == m_width || property == m_height)) {
240 if (property == m_width) { 240 if (property == m_width) {
241 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, 241 addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
242 m_width->cssValue()); 242 m_width->cssValue());
243 } else if (property == m_height) { 243 } else if (property == m_height) {
244 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, 244 addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
245 m_height->cssValue()); 245 m_height->cssValue());
246 } 246 }
247 } else { 247 } else {
248 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, 248 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value,
249 style); 249 style);
250 } 250 }
251 } 251 }
252 252
253 void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName) { 253 void SVGSVGElement::svgAttributeChanged(const QualifiedName& attrName) {
254 bool updateRelativeLengthsOrViewBox = false; 254 bool updateRelativeLengthsOrViewBox = false;
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 visitor->trace(m_width); 724 visitor->trace(m_width);
725 visitor->trace(m_height); 725 visitor->trace(m_height);
726 visitor->trace(m_translation); 726 visitor->trace(m_translation);
727 visitor->trace(m_timeContainer); 727 visitor->trace(m_timeContainer);
728 visitor->trace(m_viewSpec); 728 visitor->trace(m_viewSpec);
729 SVGGraphicsElement::trace(visitor); 729 SVGGraphicsElement::trace(visitor);
730 SVGFitToViewBox::trace(visitor); 730 SVGFitToViewBox::trace(visitor);
731 } 731 }
732 732
733 } // namespace blink 733 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGRectElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698