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

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

Issue 329143007: Fix some SVGFonts compilation errors (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/dom/custom/CustomElement.cpp ('k') | Source/core/rendering/svg/SVGTextRunRenderingContext.h » ('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 3d45b193ec2e7897a2c94ec2300afc289d464604..1bd0a2dc5024eeabc3ee2df285e064c92dd855b0 100644
--- a/Source/core/rendering/svg/SVGResources.cpp
+++ b/Source/core/rendering/svg/SVGResources.cpp
@@ -52,13 +52,17 @@ static HashSet<AtomicString>& clipperFilterMaskerTags()
s_tagList.add(SVGNames::aTag.localName());
s_tagList.add(SVGNames::circleTag.localName());
s_tagList.add(SVGNames::ellipseTag.localName());
+#if ENABLE(SVG_FONTS)
s_tagList.add(SVGNames::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());
+#if ENABLE(SVG_FONTS)
s_tagList.add(SVGNames::missing_glyphTag.localName());
+#endif
s_tagList.add(SVGNames::pathTag.localName());
s_tagList.add(SVGNames::polygonTag.localName());
s_tagList.add(SVGNames::polylineTag.localName());
@@ -75,7 +79,9 @@ static HashSet<AtomicString>& clipperFilterMaskerTags()
// 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());
+#endif
s_tagList.add(SVGNames::textPathTag.localName());
s_tagList.add(SVGNames::tspanTag.localName());
@@ -108,7 +114,9 @@ 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());
+#endif
s_tagList.add(SVGNames::circleTag.localName());
s_tagList.add(SVGNames::ellipseTag.localName());
s_tagList.add(SVGNames::lineTag.localName());
« no previous file with comments | « Source/core/dom/custom/CustomElement.cpp ('k') | Source/core/rendering/svg/SVGTextRunRenderingContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698