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

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

Issue 21042009: [SVG2] Merge SVGStyledElement into SVGElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/svg/SVGResources.cpp ('k') | Source/core/svg/SVGAnimatedType.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, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2010 Apple Inc. All rights reserved.
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 82
83 String SVGAElement::title() const 83 String SVGAElement::title() const
84 { 84 {
85 // If the xlink:title is set (non-empty string), use it. 85 // If the xlink:title is set (non-empty string), use it.
86 const AtomicString& title = fastGetAttribute(XLinkNames::titleAttr); 86 const AtomicString& title = fastGetAttribute(XLinkNames::titleAttr);
87 if (!title.isEmpty()) 87 if (!title.isEmpty())
88 return title; 88 return title;
89 89
90 // Otherwise, use the title of this element. 90 // Otherwise, use the title of this element.
91 return SVGStyledElement::title(); 91 return SVGElement::title();
92 } 92 }
93 93
94 bool SVGAElement::isSupportedAttribute(const QualifiedName& attrName) 94 bool SVGAElement::isSupportedAttribute(const QualifiedName& attrName)
95 { 95 {
96 DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ()); 96 DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
97 if (supportedAttributes.isEmpty()) { 97 if (supportedAttributes.isEmpty()) {
98 SVGURIReference::addSupportedAttributes(supportedAttributes); 98 SVGURIReference::addSupportedAttributes(supportedAttributes);
99 SVGExternalResourcesRequired::addSupportedAttributes(supportedAttributes ); 99 SVGExternalResourcesRequired::addSupportedAttributes(supportedAttributes );
100 supportedAttributes.add(SVGNames::targetAttr); 100 supportedAttributes.add(SVGNames::targetAttr);
101 } 101 }
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 // The 'a' element may contain any element that its parent may contain, exce pt itself. 235 // The 'a' element may contain any element that its parent may contain, exce pt itself.
236 if (childContext.node()->hasTagName(SVGNames::aTag)) 236 if (childContext.node()->hasTagName(SVGNames::aTag))
237 return false; 237 return false;
238 if (parentNode() && parentNode()->isSVGElement()) 238 if (parentNode() && parentNode()->isSVGElement())
239 return parentNode()->childShouldCreateRenderer(childContext); 239 return parentNode()->childShouldCreateRenderer(childContext);
240 240
241 return SVGElement::childShouldCreateRenderer(childContext); 241 return SVGElement::childShouldCreateRenderer(childContext);
242 } 242 }
243 243
244 } // namespace WebCore 244 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGResources.cpp ('k') | Source/core/svg/SVGAnimatedType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698