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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/rendering/svg/SVGResources.cpp

Issue 332773002: Clean up SVGNames usage in core/rendering (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/svg/SVGRenderTreeAsText.cpp ('k') | Source/core/rendering/svg/SVGRootInlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/SVGResources.cpp
diff --git a/Source/core/rendering/svg/SVGResources.cpp b/Source/core/rendering/svg/SVGResources.cpp
index 1bd0a2dc5024eeabc3ee2df285e064c92dd855b0..c48303af1b5a5f3e72073d908d4c08bcd8e93b41 100644
--- a/Source/core/rendering/svg/SVGResources.cpp
+++ b/Source/core/rendering/svg/SVGResources.cpp
@@ -38,6 +38,8 @@
namespace WebCore {
+using namespace SVGNames;
+
SVGResources::SVGResources()
: m_linkedResource(0)
{
@@ -49,45 +51,45 @@ static HashSet<AtomicString>& clipperFilterMaskerTags()
if (s_tagList.isEmpty()) {
// "container elements": http://www.w3.org/TR/SVG11/intro.html#TermContainerElement
// "graphics elements" : http://www.w3.org/TR/SVG11/intro.html#TermGraphicsElement
- s_tagList.add(SVGNames::aTag.localName());
- s_tagList.add(SVGNames::circleTag.localName());
- s_tagList.add(SVGNames::ellipseTag.localName());
+ s_tagList.add(aTag.localName());
+ s_tagList.add(circleTag.localName());
+ s_tagList.add(ellipseTag.localName());
#if ENABLE(SVG_FONTS)
- s_tagList.add(SVGNames::glyphTag.localName());
+ s_tagList.add(glyphTag.localName());
#endif
- s_tagList.add(SVGNames::gTag.localName());
- s_tagList.add(SVGNames::imageTag.localName());
- s_tagList.add(SVGNames::lineTag.localName());
- s_tagList.add(SVGNames::markerTag.localName());
- s_tagList.add(SVGNames::maskTag.localName());
+ s_tagList.add(gTag.localName());
+ s_tagList.add(imageTag.localName());
+ s_tagList.add(lineTag.localName());
+ s_tagList.add(markerTag.localName());
+ s_tagList.add(maskTag.localName());
#if ENABLE(SVG_FONTS)
- s_tagList.add(SVGNames::missing_glyphTag.localName());
+ s_tagList.add(missing_glyphTag.localName());
#endif
- s_tagList.add(SVGNames::pathTag.localName());
- s_tagList.add(SVGNames::polygonTag.localName());
- s_tagList.add(SVGNames::polylineTag.localName());
- s_tagList.add(SVGNames::rectTag.localName());
- s_tagList.add(SVGNames::svgTag.localName());
- s_tagList.add(SVGNames::textTag.localName());
- s_tagList.add(SVGNames::useTag.localName());
+ s_tagList.add(pathTag.localName());
+ s_tagList.add(polygonTag.localName());
+ s_tagList.add(polylineTag.localName());
+ s_tagList.add(rectTag.localName());
+ s_tagList.add(svgTag.localName());
+ s_tagList.add(textTag.localName());
+ s_tagList.add(useTag.localName());
// Not listed in the definitions is the clipPath element, the SVG spec says though:
// The "clipPath" element or any of its children can specify property "clip-path".
// So we have to add clipPathTag here, otherwhise clip-path on clipPath will fail.
// (Already mailed SVG WG, waiting for a solution)
- s_tagList.add(SVGNames::clipPathTag.localName());
+ s_tagList.add(clipPathTag.localName());
// Not listed in the definitions are the text content elements, though filter/clipper/masker on tspan/text/.. is allowed.
// (Already mailed SVG WG, waiting for a solution)
#if ENABLE(SVG_FONTS)
- s_tagList.add(SVGNames::altGlyphTag.localName());
+ s_tagList.add(altGlyphTag.localName());
#endif
- s_tagList.add(SVGNames::textPathTag.localName());
- s_tagList.add(SVGNames::tspanTag.localName());
+ s_tagList.add(textPathTag.localName());
+ s_tagList.add(tspanTag.localName());
// Not listed in the definitions is the foreignObject element, but clip-path
// is a supported attribute.
- s_tagList.add(SVGNames::foreignObjectTag.localName());
+ s_tagList.add(foreignObjectTag.localName());
// Elements that we ignore, as it doesn't make any sense.
// defs, pattern, switch (FIXME: Mail SVG WG about these)
@@ -101,10 +103,10 @@ bool SVGResources::supportsMarkers(const SVGElement& element)
{
DEFINE_STATIC_LOCAL(HashSet<AtomicString>, s_tagList, ());
if (s_tagList.isEmpty()) {
- s_tagList.add(SVGNames::lineTag.localName());
- s_tagList.add(SVGNames::pathTag.localName());
- s_tagList.add(SVGNames::polygonTag.localName());
- s_tagList.add(SVGNames::polylineTag.localName());
+ s_tagList.add(lineTag.localName());
+ s_tagList.add(pathTag.localName());
+ s_tagList.add(polygonTag.localName());
+ s_tagList.add(polylineTag.localName());
}
return s_tagList.contains(element.localName());
@@ -115,18 +117,18 @@ static HashSet<AtomicString>& fillAndStrokeTags()
DEFINE_STATIC_LOCAL(HashSet<AtomicString>, s_tagList, ());
if (s_tagList.isEmpty()) {
#if ENABLE(SVG_FONTS)
- s_tagList.add(SVGNames::altGlyphTag.localName());
+ s_tagList.add(altGlyphTag.localName());
#endif
- s_tagList.add(SVGNames::circleTag.localName());
- s_tagList.add(SVGNames::ellipseTag.localName());
- s_tagList.add(SVGNames::lineTag.localName());
- s_tagList.add(SVGNames::pathTag.localName());
- s_tagList.add(SVGNames::polygonTag.localName());
- s_tagList.add(SVGNames::polylineTag.localName());
- s_tagList.add(SVGNames::rectTag.localName());
- s_tagList.add(SVGNames::textTag.localName());
- s_tagList.add(SVGNames::textPathTag.localName());
- s_tagList.add(SVGNames::tspanTag.localName());
+ s_tagList.add(circleTag.localName());
+ s_tagList.add(ellipseTag.localName());
+ s_tagList.add(lineTag.localName());
+ s_tagList.add(pathTag.localName());
+ s_tagList.add(polygonTag.localName());
+ s_tagList.add(polylineTag.localName());
+ s_tagList.add(rectTag.localName());
+ s_tagList.add(textTag.localName());
+ s_tagList.add(textPathTag.localName());
+ s_tagList.add(tspanTag.localName());
}
return s_tagList;
@@ -136,10 +138,10 @@ static HashSet<AtomicString>& chainableResourceTags()
{
DEFINE_STATIC_LOCAL(HashSet<AtomicString>, s_tagList, ());
if (s_tagList.isEmpty()) {
- s_tagList.add(SVGNames::linearGradientTag.localName());
- s_tagList.add(SVGNames::filterTag.localName());
- s_tagList.add(SVGNames::patternTag.localName());
- s_tagList.add(SVGNames::radialGradientTag.localName());
+ s_tagList.add(linearGradientTag.localName());
+ s_tagList.add(filterTag.localName());
+ s_tagList.add(patternTag.localName());
+ s_tagList.add(radialGradientTag.localName());
}
return s_tagList;
« no previous file with comments | « Source/core/rendering/svg/SVGRenderTreeAsText.cpp ('k') | Source/core/rendering/svg/SVGRootInlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698