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/SVGForeignObjectElement.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) 2006 Apple Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 bool SVGForeignObjectElement::isPresentationAttributeWithSVGDOM(const QualifiedN ame& attrName) const 65 bool SVGForeignObjectElement::isPresentationAttributeWithSVGDOM(const QualifiedN ame& attrName) const
66 { 66 {
67 if (attrName == SVGNames::xAttr || attrName== SVGNames::yAttr 67 if (attrName == SVGNames::xAttr || attrName== SVGNames::yAttr
68 || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr) 68 || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr)
69 return true; 69 return true;
70 return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName); 70 return SVGGraphicsElement::isPresentationAttributeWithSVGDOM(attrName);
71 } 71 }
72 72
73 void SVGForeignObjectElement::collectStyleForPresentationAttribute(const Qualifi edName& name, const AtomicString& value, MutableStylePropertySet* style) 73 void SVGForeignObjectElement::collectStyleForPresentationAttribute(const Qualifi edName& name, const AtomicString& value, MutableStylePropertySet* style)
74 { 74 {
75 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 75 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
76 if (property == m_width) 76 if (property == m_width)
77 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, m_width ->currentValue()->asCSSPrimitiveValue()); 77 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, m_width ->currentValue()->asCSSPrimitiveValue());
78 else if (property == m_height) 78 else if (property == m_height)
79 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, m_heig ht->currentValue()->asCSSPrimitiveValue()); 79 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, m_heig ht->currentValue()->asCSSPrimitiveValue());
80 else if (property == m_x) 80 else if (property == m_x)
81 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, m_x->curren tValue()->asCSSPrimitiveValue()); 81 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, m_x->curren tValue()->asCSSPrimitiveValue());
82 else if (property == m_y) 82 else if (property == m_y)
83 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, m_y->curren tValue()->asCSSPrimitiveValue()); 83 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, m_y->curren tValue()->asCSSPrimitiveValue());
84 else 84 else
85 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, st yle); 85 SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, st yle);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 bool SVGForeignObjectElement::selfHasRelativeLengths() const 134 bool SVGForeignObjectElement::selfHasRelativeLengths() const
135 { 135 {
136 return m_x->currentValue()->isRelative() 136 return m_x->currentValue()->isRelative()
137 || m_y->currentValue()->isRelative() 137 || m_y->currentValue()->isRelative()
138 || m_width->currentValue()->isRelative() 138 || m_width->currentValue()->isRelative()
139 || m_height->currentValue()->isRelative(); 139 || m_height->currentValue()->isRelative();
140 } 140 }
141 141
142 } // namespace blink 142 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698