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

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

Issue 203193008: Make supportsMarkers non virtual (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix compile error Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/svg/SVGElement.h » ('j') | Source/core/svg/SVGElement.h » ('J')
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 f59ad854bb75e8a014276dfaed8e044e4a491694..a5d1ba1614a27beef8ec0d59aa711cae4ada953f 100644
--- a/Source/core/rendering/svg/SVGResources.cpp
+++ b/Source/core/rendering/svg/SVGResources.cpp
@@ -91,19 +91,6 @@ static HashSet<AtomicString>& clipperFilterMaskerTags()
return s_tagList;
}
-static HashSet<AtomicString>& markerTags()
-{
- 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());
- }
-
- return s_tagList;
-}
-
static HashSet<AtomicString>& fillAndStrokeTags()
{
DEFINE_STATIC_LOCAL(HashSet<AtomicString>, s_tagList, ());
@@ -250,7 +237,7 @@ PassOwnPtr<SVGResources> SVGResources::buildResources(const RenderObject* object
}
}
- if (markerTags().contains(tagName) && style->hasMarkers()) {
+ if (element->supportsMarkers() && style->hasMarkers()) {
f(malita) 2014/03/19 14:58:55 Let's invert the order here - I suspect style->has
AtomicString markerStartId(style->markerStartResource());
if (!ensureResources(resources)->setMarkerStart(getRenderSVGResourceById<RenderSVGResourceMarker>(document, markerStartId)))
registerPendingResource(extensions, markerStartId, element);
« no previous file with comments | « no previous file | Source/core/svg/SVGElement.h » ('j') | Source/core/svg/SVGElement.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698