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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGMaskElement.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) 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 * Copyright (C) 2005 Alexander Kellett <lypanov@kde.org> 4 * Copyright (C) 2005 Alexander Kellett <lypanov@kde.org>
5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
6 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 bool SVGMaskElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attr Name) const 78 bool SVGMaskElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attr Name) const
79 { 79 {
80 if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr 80 if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr
81 || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr) 81 || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr)
82 return true; 82 return true;
83 return SVGElement::isPresentationAttributeWithSVGDOM(attrName); 83 return SVGElement::isPresentationAttributeWithSVGDOM(attrName);
84 } 84 }
85 85
86 void SVGMaskElement::collectStyleForPresentationAttribute(const QualifiedName& n ame, const AtomicString& value, MutableStylePropertySet* style) 86 void SVGMaskElement::collectStyleForPresentationAttribute(const QualifiedName& n ame, const AtomicString& value, MutableStylePropertySet* style)
87 { 87 {
88 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> property = propertyFromAttribute (name); 88 SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
89 if (property == m_x) 89 if (property == m_x)
90 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, m_x->curren tValue()->asCSSPrimitiveValue()); 90 addPropertyToPresentationAttributeStyle(style, CSSPropertyX, m_x->curren tValue()->asCSSPrimitiveValue());
91 else if (property == m_y) 91 else if (property == m_y)
92 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, m_y->curren tValue()->asCSSPrimitiveValue()); 92 addPropertyToPresentationAttributeStyle(style, CSSPropertyY, m_y->curren tValue()->asCSSPrimitiveValue());
93 else if (property == m_width) 93 else if (property == m_width)
94 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, m_width ->currentValue()->asCSSPrimitiveValue()); 94 addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, m_width ->currentValue()->asCSSPrimitiveValue());
95 else if (property == m_height) 95 else if (property == m_height)
96 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, m_heig ht->currentValue()->asCSSPrimitiveValue()); 96 addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight, m_heig ht->currentValue()->asCSSPrimitiveValue());
97 else 97 else
98 SVGElement::collectStyleForPresentationAttribute(name, value, style); 98 SVGElement::collectStyleForPresentationAttribute(name, value, style);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 bool SVGMaskElement::selfHasRelativeLengths() const 147 bool SVGMaskElement::selfHasRelativeLengths() const
148 { 148 {
149 return m_x->currentValue()->isRelative() 149 return m_x->currentValue()->isRelative()
150 || m_y->currentValue()->isRelative() 150 || m_y->currentValue()->isRelative()
151 || m_width->currentValue()->isRelative() 151 || m_width->currentValue()->isRelative()
152 || m_height->currentValue()->isRelative(); 152 || m_height->currentValue()->isRelative();
153 } 153 }
154 154
155 } // namespace blink 155 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGImageElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGPathElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698