Attachment 107525 Details for Bug 68179 – Patch

[patch] Patch

bug-68179-20110915120820.patch (text/plain), 94.50 KB, created by Eric Seidel (no email) on 2011-09-15 12:08:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Seidel (no email)

Created: 2011-09-15 12:08:21 PDT

Size: 94.50 KB

patch

obsolete

>Subversion Revision: 95202
>diff --git a/ChangeLog b/ChangeLog
>index ab5043bc13985fdf2c7ad34d080445d81abc484d..3fd780d2d75a694303a72c3c8e39f3f55916136a 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsEfl.cmake:
>+        * Source/cmake/OptionsWinCE.cmake:
>+        * Source/cmakeconfig.h.cmake:
>+        * configure.ac:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index b8850e406905e6f1bb20b10a17b06729a43894d9..aa6d941a0a2500409d98a55aa6f60bf97a113831 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index e31e88a1f883333f162c54839717d8b6cfd02a00..414cfa09ad7730fd78700985e3a300c299f45320 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -85,7 +85,6 @@ ENABLE_REGISTER_PROTOCOL_HANDLER = ;
> ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
> ENABLE_SVG = ENABLE_SVG;
> ENABLE_SVG_AS_IMAGE = ENABLE_SVG_AS_IMAGE;
>-ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
> ENABLE_TOUCH_ICON_LOADING = ;
> ENABLE_VIDEO = ENABLE_VIDEO;
> ENABLE_VIDEO_TRACK = ;
>@@ -98,4 +97,4 @@ ENABLE_XHTMLMP = ;
> ENABLE_XPATH = ENABLE_XPATH;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 82ba20618f82561599b2bca1b64cda76cb28dc7c..2c46eccea9bd09372c1c674453b294f6c8304a6d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,118 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * DerivedSources.make:
>+        * GNUmakefile.am:
>+        * bindings/objc/DOM.mm:
>+        (WebCore::createElementClassMap):
>+        * css/CSSFontFace.cpp:
>+        * css/CSSFontFace.h:
>+        * css/CSSFontFaceSource.cpp:
>+        (WebCore::CSSFontFaceSource::CSSFontFaceSource):
>+        (WebCore::CSSFontFaceSource::getFontData):
>+        * css/CSSFontFaceSource.h:
>+        * css/CSSFontFaceSrcValue.cpp:
>+        (WebCore::CSSFontFaceSrcValue::isSupportedFormat):
>+        * css/CSSFontFaceSrcValue.h:
>+        (WebCore::CSSFontFaceSrcValue::CSSFontFaceSrcValue):
>+        * css/CSSFontSelector.cpp:
>+        (WebCore::CSSFontSelector::addFontFaceRule):
>+        (WebCore::CSSFontSelector::getFontData):
>+        * dom/DOMImplementation.cpp:
>+        (WebCore::isSVG10Feature):
>+        (WebCore::isSVG11Feature):
>+        * features.pri:
>+        * loader/cache/CachedFont.cpp:
>+        (WebCore::CachedFont::platformDataFromCustomData):
>+        * loader/cache/CachedFont.h:
>+        * page/DOMWindow.idl:
>+        * platform/graphics/Font.cpp:
>+        (WebCore::Font::width):
>+        (WebCore::Font::codePath):
>+        * platform/graphics/FontFastPath.cpp:
>+        (WebCore::Font::drawGlyphBuffer):
>+        * platform/graphics/GlyphPageTreeNode.cpp:
>+        (WebCore::fill):
>+        * platform/graphics/SVGGlyph.cpp:
>+        * platform/graphics/SVGGlyph.h:
>+        * platform/graphics/SimpleFontData.cpp:
>+        (WebCore::SimpleFontData::~SimpleFontData):
>+        * platform/graphics/TextRun.h:
>+        * platform/graphics/WidthIterator.cpp:
>+        (WebCore::WidthIterator::glyphDataForCharacter):
>+        * platform/graphics/WidthIterator.h:
>+        * rendering/svg/SVGInlineTextBox.cpp:
>+        (WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
>+        (WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
>+        * rendering/svg/SVGTextLayoutEngineSpacing.cpp:
>+        (WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
>+        * rendering/svg/SVGTextLayoutEngineSpacing.h:
>+        * rendering/svg/SVGTextRunRenderingContext.cpp:
>+        * rendering/svg/SVGTextRunRenderingContext.h:
>+        (WebCore::SVGTextRunRenderingContext::SVGTextRunRenderingContext):
>+        * svg/SVGAltGlyphDefElement.cpp:
>+        * svg/SVGAltGlyphDefElement.h:
>+        * svg/SVGAltGlyphDefElement.idl:
>+        * svg/SVGAltGlyphElement.cpp:
>+        * svg/SVGAltGlyphElement.h:
>+        * svg/SVGAltGlyphElement.idl:
>+        * svg/SVGAltGlyphItemElement.cpp:
>+        * svg/SVGAltGlyphItemElement.h:
>+        * svg/SVGAltGlyphItemElement.idl:
>+        * svg/SVGFontData.cpp:
>+        * svg/SVGFontData.h:
>+        * svg/SVGFontElement.cpp:
>+        * svg/SVGFontElement.h:
>+        * svg/SVGFontElement.idl:
>+        * svg/SVGFontFaceElement.cpp:
>+        * svg/SVGFontFaceElement.h:
>+        * svg/SVGFontFaceElement.idl:
>+        * svg/SVGFontFaceFormatElement.cpp:
>+        * svg/SVGFontFaceFormatElement.h:
>+        * svg/SVGFontFaceFormatElement.idl:
>+        * svg/SVGFontFaceNameElement.cpp:
>+        * svg/SVGFontFaceNameElement.h:
>+        * svg/SVGFontFaceNameElement.idl:
>+        * svg/SVGFontFaceSrcElement.cpp:
>+        * svg/SVGFontFaceSrcElement.h:
>+        * svg/SVGFontFaceSrcElement.idl:
>+        * svg/SVGFontFaceUriElement.cpp:
>+        * svg/SVGFontFaceUriElement.h:
>+        * svg/SVGFontFaceUriElement.idl:
>+        * svg/SVGGlyphElement.cpp:
>+        * svg/SVGGlyphElement.h:
>+        * svg/SVGGlyphElement.idl:
>+        * svg/SVGGlyphMap.h:
>+        * svg/SVGGlyphRefElement.cpp:
>+        * svg/SVGGlyphRefElement.h:
>+        * svg/SVGGlyphRefElement.idl:
>+        * svg/SVGHKernElement.cpp:
>+        * svg/SVGHKernElement.h:
>+        * svg/SVGHKernElement.idl:
>+        * svg/SVGMissingGlyphElement.cpp:
>+        * svg/SVGMissingGlyphElement.h:
>+        * svg/SVGMissingGlyphElement.idl:
>+        * svg/SVGTRefElement.cpp:
>+        (WebCore::SVGTRefElement::rendererIsNeeded):
>+        * svg/SVGTSpanElement.cpp:
>+        (WebCore::SVGTSpanElement::childShouldCreateRenderer):
>+        (WebCore::SVGTSpanElement::rendererIsNeeded):
>+        * svg/SVGTextContentElement.cpp:
>+        (WebCore::SVGTextContentElement::elementFromRenderer):
>+        * svg/SVGTextElement.cpp:
>+        (WebCore::SVGTextElement::childShouldCreateRenderer):
>+        * svg/SVGTextPositioningElement.cpp:
>+        (WebCore::SVGTextPositioningElement::elementFromRenderer):
>+        * svg/SVGVKernElement.cpp:
>+        * svg/SVGVKernElement.h:
>+        * svg/SVGVKernElement.idl:
>+        * svg/svgtags.in:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 85658030405616a8ae1c28025cfed7386174534b..58f8ef93e2299ae5b6d4b7a786bb9b7b59786936 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -84,7 +84,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
> ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
> ENABLE_SVG = ENABLE_SVG;
> ENABLE_SVG_AS_IMAGE = ENABLE_SVG_AS_IMAGE;
>-ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
> ENABLE_TOUCH_ICON_LOADING = ;
> ENABLE_VIDEO = ENABLE_VIDEO;
> ENABLE_VIDEO_TRACK = ;
>@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
> ENABLE_XPATH = ENABLE_XPATH;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index 63095d96032f750a82a374840df68c2dcb9f415c..ae4cb35be19720e44a2eaefd7621d91db82cc512 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -819,10 +819,6 @@ XMLNames.cpp : dom/make_names.pl xml/xmlattrs.in
> 
> # SVG tag and attribute names, and element factory
> 
>-ifeq ($(findstring ENABLE_SVG_FONTS,$(FEATURE_DEFINES)), ENABLE_SVG_FONTS)
>-    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
>-endif
>-
> ifeq ($(findstring ENABLE_FILTERS,$(FEATURE_DEFINES)), ENABLE_FILTERS)
>     SVG_FLAGS := $(SVG_FLAGS) ENABLE_FILTERS=1
> endif
>diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
>index 45e4526c63ef7a0669559d834e7f83bcc06b8a1b..aa6f67e6dd3a90e64ebd6d43caacfffba0083249 100644
>--- a/Source/WebCore/GNUmakefile.am
>+++ b/Source/WebCore/GNUmakefile.am
>@@ -499,12 +499,6 @@ WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in
> WEBCORE_CSS_VALUE_KEYWORDS += $(WebCore)/css/SVGCSSValueKeywords.in
> 
> # SVG Features
>-if ENABLE_SVG_FONTS
>-FEATURE_DEFINES += ENABLE_SVG_FONTS=1
>-SVG_FEATURES += ENABLE_SVG_FONTS=1
>-webcore_cppflags += -DENABLE_SVG_FONTS=1
>-endif
>-
> if ENABLE_SVG_AS_IMAGE
> FEATURE_DEFINES += ENABLE_SVG_AS_IMAGE=1
> SVG_FEATURES += ENABLE_SVG_AS_IMAGE=1
>diff --git a/Source/WebCore/bindings/objc/DOM.mm b/Source/WebCore/bindings/objc/DOM.mm
>index a18cb03bb30d994f3e8decac23300ca420ab5ffa..c8a34ac92e1e23f713467b4cb66c70a8a6a092a3 100644
>--- a/Source/WebCore/bindings/objc/DOM.mm
>+++ b/Source/WebCore/bindings/objc/DOM.mm
>@@ -188,7 +188,6 @@ static void createElementClassMap()
>     addElementClass(SVGNames::feTurbulenceTag, [DOMSVGFETurbulenceElement class]);
>     addElementClass(SVGNames::filterTag, [DOMSVGFilterElement class]);
> #endif
>-#if ENABLE(SVG_FONTS)
>     addElementClass(SVGNames::fontTag, [DOMSVGFontElement class]);
>     addElementClass(SVGNames::font_faceTag, [DOMSVGFontFaceElement class]);
>     addElementClass(SVGNames::font_face_formatTag, [DOMSVGFontFaceFormatElement class]);
>@@ -197,7 +196,6 @@ static void createElementClassMap()
>     addElementClass(SVGNames::font_face_uriTag, [DOMSVGFontFaceUriElement class]);
>     addElementClass(SVGNames::glyphTag, [DOMSVGGlyphElement class]);
>     addElementClass(SVGNames::glyphRefTag, [DOMSVGGlyphRefElement class]);
>-#endif
>     addElementClass(SVGNames::gTag, [DOMSVGGElement class]);
>     addElementClass(SVGNames::imageTag, [DOMSVGImageElement class]);
>     addElementClass(SVGNames::lineTag, [DOMSVGLineElement class]);
>@@ -205,9 +203,7 @@ static void createElementClassMap()
>     addElementClass(SVGNames::markerTag, [DOMSVGMarkerElement class]);
>     addElementClass(SVGNames::maskTag, [DOMSVGMaskElement class]);
>     addElementClass(SVGNames::metadataTag, [DOMSVGMetadataElement class]);
>-#if ENABLE(SVG_FONTS)
>     addElementClass(SVGNames::missing_glyphTag, [DOMSVGMissingGlyphElement class]);
>-#endif
>     addElementClass(SVGNames::pathTag, [DOMSVGPathElement class]);
>     addElementClass(SVGNames::patternTag, [DOMSVGPatternElement class]);
>     addElementClass(SVGNames::polygonTag, [DOMSVGPolygonElement class]);
>diff --git a/Source/WebCore/css/CSSFontFace.cpp b/Source/WebCore/css/CSSFontFace.cpp
>index 3b6dea40bc37c6a91fc46dc9dcc0cbdfa2d31de8..9597349a3b0d93c92d429911fd6106d61a988091 100644
>--- a/Source/WebCore/css/CSSFontFace.cpp
>+++ b/Source/WebCore/css/CSSFontFace.cpp
>@@ -131,7 +131,7 @@ void CSSFontFace::retireCustomFont(SimpleFontData* fontData)
>     (*m_segmentedFontFaces.begin())->fontSelector()->retireCustomFont(fontData);
> }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> bool CSSFontFace::hasSVGFontFaceSource() const
> {
>     for (unsigned i = 0; i < m_sources.size(); i++) {
>diff --git a/Source/WebCore/css/CSSFontFace.h b/Source/WebCore/css/CSSFontFace.h
>index 45f8f13b8eb6d81633ecab9213aafb24b10ed091..c46f052ce090e69e180e0934a769cf20876a13a1 100644
>--- a/Source/WebCore/css/CSSFontFace.h
>+++ b/Source/WebCore/css/CSSFontFace.h
>@@ -82,7 +82,7 @@ public:
>         UChar32 m_to;
>     };
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     bool hasSVGFontFaceSource() const;
> #endif
> 
>diff --git a/Source/WebCore/css/CSSFontFaceSource.cpp b/Source/WebCore/css/CSSFontFaceSource.cpp
>index 3cf4e67744935bffb88e9bcb5b1a70ad446ed231..0f2c0bad4e521ccb7637772d19492fcedf082c38 100644
>--- a/Source/WebCore/css/CSSFontFaceSource.cpp
>+++ b/Source/WebCore/css/CSSFontFaceSource.cpp
>@@ -35,7 +35,7 @@
> #include "GlyphPageTreeNode.h"
> #include "SimpleFontData.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "FontCustomPlatformData.h"
> #include "SVGFontData.h"
> #include "SVGFontElement.h"
>@@ -51,7 +51,7 @@ CSSFontFaceSource::CSSFontFaceSource(const String& str, CachedFont* font)
>     , m_font(font)
>     , m_face(0)
>     , m_loadStartTimer(this, &CSSFontFaceSource::startLoadingTimerFired)
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     , m_hasExternalSVGFont(false)
> #endif
> {
>@@ -106,7 +106,7 @@ SimpleFontData* CSSFontFaceSource::getFontData(const FontDescription& fontDescri
>     if (!isValid())
>         return 0;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (!m_font && !m_svgFontFaceElement) {
> #else
>     if (!m_font) {
>@@ -126,7 +126,7 @@ SimpleFontData* CSSFontFaceSource::getFontData(const FontDescription& fontDescri
>     // If we are still loading, then we let the system pick a font.
>     if (isLoaded()) {
>         if (m_font) {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>             if (m_hasExternalSVGFont) {
>                 // For SVG fonts parse the external SVG document, and extract the <font> element.
>                 if (!m_font->ensureSVGFontData())
>@@ -173,7 +173,7 @@ SimpleFontData* CSSFontFaceSource::getFontData(const FontDescription& fontDescri
>                                                                                    fontDescription.textOrientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false));
>             }
>         } else {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>             // In-Document SVG Fonts
>             if (m_svgFontFaceElement)
>                 fontData = adoptPtr(new SimpleFontData(SVGFontData::create(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic));
>@@ -209,7 +209,7 @@ void CSSFontFaceSource::startLoadingTimerFired(Timer<WebCore::CSSFontFaceSource>
>     m_fontSelector = nullptr;
> }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> SVGFontFaceElement* CSSFontFaceSource::svgFontFaceElement() const
> {
>     return m_svgFontFaceElement.get();
>diff --git a/Source/WebCore/css/CSSFontFaceSource.h b/Source/WebCore/css/CSSFontFaceSource.h
>index 097fc36fcf1d406738f3aa7fea0957a0e190c732..865b4b432a0dc08e6a91a162850e905ee8140d23 100644
>--- a/Source/WebCore/css/CSSFontFaceSource.h
>+++ b/Source/WebCore/css/CSSFontFaceSource.h
>@@ -39,7 +39,7 @@ class CSSFontFace;
> class CSSFontSelector;
> class FontDescription;
> class SimpleFontData;
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> class SVGFontElement;
> class SVGFontFaceElement;
> #endif
>@@ -63,7 +63,7 @@ public:
>     
>     void pruneTable();
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     SVGFontFaceElement* svgFontFaceElement() const;
>     void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>);
>     bool isSVGFontFaceSource() const;
>@@ -81,7 +81,7 @@ private:
>     Timer<CSSFontFaceSource> m_loadStartTimer;
>     RefPtr<CSSFontSelector> m_fontSelector;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
>     RefPtr<SVGFontElement> m_externalSVGFontElement;
>     bool m_hasExternalSVGFont;
>diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.cpp b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>index 03edbcb3eef54905cba0f3099fdf1b2c44e7144a..2a6dd428b158df11725ac76e0577c094b7eb5e09 100644
>--- a/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>+++ b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
>@@ -35,7 +35,7 @@ CSSFontFaceSrcValue::~CSSFontFaceSrcValue()
> {
> }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> bool CSSFontFaceSrcValue::isSVGFontFaceSrc() const
> {
>     return equalIgnoringCase(m_format, "svg");
>@@ -54,7 +54,7 @@ bool CSSFontFaceSrcValue::isSupportedFormat() const
>     }
> 
>     return FontCustomPlatformData::supportsFormat(m_format)
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>            || isSVGFontFaceSrc()
> #endif
>            ;
>diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.h b/Source/WebCore/css/CSSFontFaceSrcValue.h
>index a6c8bb9687ffa23eea74b03f8cdff3c8e38ef62b..75beb16d22bb7a5ff4717aac900ab0d66eda7db7 100644
>--- a/Source/WebCore/css/CSSFontFaceSrcValue.h
>+++ b/Source/WebCore/css/CSSFontFaceSrcValue.h
>@@ -55,7 +55,7 @@ public:
> 
>     bool isSupportedFormat() const;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     bool isSVGFontFaceSrc() const;
> 
>     SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
>@@ -70,7 +70,7 @@ private:
>     CSSFontFaceSrcValue(const String& resource, bool local)
>         : m_resource(resource)
>         , m_isLocal(local)
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>         , m_svgFontFaceElement(0)
> #endif
>     {
>@@ -80,7 +80,7 @@ private:
>     String m_format;
>     bool m_isLocal;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     SVGFontFaceElement* m_svgFontFaceElement;
> #endif
> };
>diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp
>index 713d928884161057471f83755df50207a68aec26..ca165239dffcb02fd86bead12575a27bc8a80b4b 100644
>--- a/Source/WebCore/css/CSSFontSelector.cpp
>+++ b/Source/WebCore/css/CSSFontSelector.cpp
>@@ -239,7 +239,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
>         CSSFontFaceSrcValue* item = static_cast<CSSFontFaceSrcValue*>(srcList->itemWithoutBoundsCheck(i));
>         CSSFontFaceSource* source = 0;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>         foundSVGFont = item->isSVGFontFaceSrc() || item->svgFontFaceElement();
> #endif
>         if (!item->isLocal()) {
>@@ -250,7 +250,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
>                 CachedFont* cachedFont = m_document->cachedResourceLoader()->requestFont(request);
>                 if (cachedFont) {
>                     source = new CSSFontFaceSource(item->resource(), cachedFont);
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>                     if (foundSVGFont)
>                         source->setHasExternalSVGFont(true);
> #endif
>@@ -264,7 +264,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
>             fontFace = CSSFontFace::create(static_cast<FontTraitsMask>(traitsMask));
> 
>         if (source) {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>             source->setSVGFontFaceElement(item->svgFontFaceElement());
> #endif
>             fontFace->addSource(source);
>@@ -552,7 +552,7 @@ FontData* CSSFontSelector::getFontData(const FontDescription& fontDescription, c
>                 continue;
>             if ((traitsMask & FontVariantNormalMask) && !(candidateTraitsMask & FontVariantNormalMask))
>                 continue;
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>             // For SVG Fonts that specify that they only support the "normal" variant, we will assume they are incapable
>             // of small-caps synthesis and just ignore the font face as a candidate.
>             if (candidate->hasSVGFontFaceSource() && (traitsMask & FontVariantSmallCapsMask) && !(candidateTraitsMask & FontVariantSmallCapsMask))
>diff --git a/Source/WebCore/dom/DOMImplementation.cpp b/Source/WebCore/dom/DOMImplementation.cpp
>index 5d550e3b697903cb0f00805c858f712fabc79ead..e3b32de2a8250efec70034ae03ec5c963f43223a 100644
>--- a/Source/WebCore/dom/DOMImplementation.cpp
>+++ b/Source/WebCore/dom/DOMImplementation.cpp
>@@ -72,7 +72,7 @@ static bool isSVG10Feature(const String &feature)
>     static bool initialized = false;
>     DEFINE_STATIC_LOCAL(FeatureSet, svgFeatures, ());
>     if (!initialized) {
>-#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
>+#if ENABLE(FILTERS)
>         addString(svgFeatures, "svg");
>         addString(svgFeatures, "svg.static");
> #endif
>@@ -80,7 +80,7 @@ static bool isSVG10Feature(const String &feature)
> //      addString(svgFeatures, "svg.dynamic");
> //      addString(svgFeatures, "svg.dom.animation");
> //      addString(svgFeatures, "svg.dom.dynamic");
>-#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
>+#if ENABLE(FILTERS)
>         addString(svgFeatures, "dom");
>         addString(svgFeatures, "dom.svg");
>         addString(svgFeatures, "dom.svg.static");
>@@ -100,7 +100,7 @@ static bool isSVG11Feature(const String &feature)
>         // Sadly, we cannot claim to implement any of the SVG 1.1 generic feature sets
>         // lack of Font and Filter support.
>         // http://bugs.webkit.org/show_bug.cgi?id=15480
>-#if ENABLE(FILTERS) && ENABLE(SVG_FONTS)
>+#if ENABLE(FILTERS)
>         addString(svgFeatures, "SVG");
>         addString(svgFeatures, "SVGDOM");
>         addString(svgFeatures, "SVG-static");
>@@ -147,10 +147,8 @@ static bool isSVG11Feature(const String &feature)
> //      addString(svgFeatures, "View"); // buggy <view> support, bug 16962
>         addString(svgFeatures, "Script");
>         addString(svgFeatures, "Animation"); 
>-#if ENABLE(SVG_FONTS)
>         addString(svgFeatures, "Font");
>         addString(svgFeatures, "BasicFont");
>-#endif
>         addString(svgFeatures, "Extensibility");
>         initialized = true;
>     }
>diff --git a/Source/WebCore/features.pri b/Source/WebCore/features.pri
>index 2a8be9d4062e3a0f7f7a6bd4976f69f2b1ae5212..c0bc36932353eee8e53a8ded4475e00e9b16b90e 100644
>--- a/Source/WebCore/features.pri
>+++ b/Source/WebCore/features.pri
>@@ -37,12 +37,6 @@ contains(CONFIG, use_system_icu) {
>     DEFINES -= WTF_USE_ICU_UNICODE
> }
> 
>-isEmpty(HAVE_QRAWFONT) {
>-    # We have to disable SVG Fonts, which rely on the fast path.
>-    DEFINES -= ENABLE_SVG_FONTS=1
>-    DEFINES += ENABLE_SVG_FONTS=0
>-}
>-
> # turn off SQLITE support if we do not have sqlite3 available
> !CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
> 
>@@ -94,10 +88,9 @@ isEmpty(HAVE_QRAWFONT) {
> # SVG support
> !contains(DEFINES, ENABLE_SVG=0) {
>     !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
>-    !contains(DEFINES, ENABLE_SVG_FONTS=.): DEFINES += ENABLE_SVG_FONTS=1
>     !contains(DEFINES, ENABLE_SVG_AS_IMAGE=.): DEFINES += ENABLE_SVG_AS_IMAGE=1
> } else {
>-    DEFINES += ENABLE_SVG_FONTS=0 ENABLE_SVG_AS_IMAGE=0
>+    DEFINES += ENABLE_SVG_AS_IMAGE=0
> }
> 
> # HTML5 datalist support
>@@ -222,7 +215,6 @@ contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTER
> contains(DEFINES, ENABLE_WCSS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WCSS=1
> contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
> contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
>-contains(DEFINES, ENABLE_SVG_FONTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FONTS=1
> contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
> contains(DEFINES, ENABLE_OFFLINE_WEB_APPLICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_OFFLINE_WEB_APPLICATIONS=1
> contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
>diff --git a/Source/WebCore/loader/cache/CachedFont.cpp b/Source/WebCore/loader/cache/CachedFont.cpp
>index e1bda2de324b1282df6748e3ed093be2cdb5f663..16c686a6c551a108b7290f80aa06eb953caf4ff9 100644
>--- a/Source/WebCore/loader/cache/CachedFont.cpp
>+++ b/Source/WebCore/loader/cache/CachedFont.cpp
>@@ -45,7 +45,7 @@
> #include "FontCustomPlatformData.h"
> #endif
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "NodeList.h"
> #include "SVGDocument.h"
> #include "SVGElement.h"
>@@ -115,7 +115,7 @@ bool CachedFont::ensureCustomFontData()
> 
> FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation orientation, TextOrientation textOrientation, FontWidthVariant widthVariant, FontRenderingMode renderingMode)
> {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (m_externalSVGDocument)
>         return FontPlatformData(size, bold, italic);
> #endif
>@@ -127,7 +127,7 @@ FontPlatformData CachedFont::platformDataFromCustomData(float size, bool bold, b
> #endif
> }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> bool CachedFont::ensureSVGFontData()
> {
>     if (!m_externalSVGDocument && !errorOccurred() && !isLoading() && m_data) {
>diff --git a/Source/WebCore/loader/cache/CachedFont.h b/Source/WebCore/loader/cache/CachedFont.h
>index 734388aa6db9bf8c818ff2752e7748faa0363ea9..245c1c33be6b3dbd3ef5adabd459c568a69aee37 100644
>--- a/Source/WebCore/loader/cache/CachedFont.h
>+++ b/Source/WebCore/loader/cache/CachedFont.h
>@@ -64,7 +64,7 @@ public:
>     bool ensureCustomFontData();
>     FontPlatformData platformDataFromCustomData(float size, bool bold, bool italic, FontOrientation = Horizontal, TextOrientation = TextOrientationVerticalRight, FontWidthVariant = RegularWidth, FontRenderingMode = NormalRenderingMode);
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     bool ensureSVGFontData();
>     SVGFontElement* getSVGFontById(const String&) const;
> #endif
>@@ -73,7 +73,7 @@ private:
>     FontCustomPlatformData* m_fontData;
>     bool m_loadInitiated;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     RefPtr<SVGDocument> m_externalSVGDocument;
> #endif
> 
>diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
>index 5fc3d7623338f437a9cc2968938e3162dd661761..51c596bce10ce078a69b5723cee93857f21d23ff 100644
>--- a/Source/WebCore/page/DOMWindow.idl
>+++ b/Source/WebCore/page/DOMWindow.idl
>@@ -741,7 +741,6 @@ module window {
>         attribute SVGMPathElementConstructor SVGMPathElement;
>         attribute SVGSetElementConstructor SVGSetElement;
> 
>-#if defined(ENABLE_SVG_FONTS) && ENABLE_SVG_FONTS
>         attribute SVGAltGlyphDefElementConstructor SVGAltGlyphDefElement;
>         attribute SVGAltGlyphElementConstructor SVGAltGlyphElement;
>         attribute SVGAltGlyphItemElementConstructor SVGAltGlyphItemElement;
>@@ -757,7 +756,6 @@ module window {
>         attribute SVGHKernElementConstructor SVGHKernElement;
>         attribute SVGMissingGlyphElementConstructor SVGMissingGlyphElement;
>         attribute SVGVKernElementConstructor SVGVKernElement;
>-#endif
> 
> #if defined(ENABLE_FILTERS) && ENABLE_FILTERS
>         attribute SVGComponentTransferFunctionElementConstructor SVGComponentTransferFunctionElement;
>diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
>index 445d1d0858a71a079d52d2c6e80251a4ade45a69..544c53e0425addab6921fd7060f3060d35bf8de5 100644
>--- a/Source/WebCore/platform/graphics/Font.cpp
>+++ b/Source/WebCore/platform/graphics/Font.cpp
>@@ -190,7 +190,7 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo
> 
> float Font::width(const TextRun& run, int& charsConsumed, String& glyphName) const
> {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (TextRun::RenderingContext* renderingContext = run.renderingContext())
>         return renderingContext->floatWidthUsingSVGFont(*this, run, charsConsumed, glyphName);
> #endif
>@@ -261,7 +261,7 @@ Font::CodePath Font::codePath(const TextRun& run) const
>     if (s_codePath != Auto)
>         return s_codePath;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (run.renderingContext())
>         return Simple;
> #endif
>diff --git a/Source/WebCore/platform/graphics/FontFastPath.cpp b/Source/WebCore/platform/graphics/FontFastPath.cpp
>index e526242afa3d6ef4c6e15b16d1bca746b06cac1d..e89569b6c16b397e55388064f15959d3a8bf92f0 100644
>--- a/Source/WebCore/platform/graphics/FontFastPath.cpp
>+++ b/Source/WebCore/platform/graphics/FontFastPath.cpp
>@@ -386,7 +386,7 @@ void Font::drawGlyphBuffer(GraphicsContext* context, const TextRun& run, const G
>     float nextX = startPoint.x();
>     int lastFrom = 0;
>     int nextGlyph = 0;
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     TextRun::RenderingContext* renderingContext = run.renderingContext();
> #endif
>     while (nextGlyph < glyphBuffer.size()) {
>@@ -394,7 +394,7 @@ void Font::drawGlyphBuffer(GraphicsContext* context, const TextRun& run, const G
>         FloatSize nextOffset = glyphBuffer.offsetAt(nextGlyph);
> 
>         if (nextFontData != fontData || nextOffset != offset) {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>             if (renderingContext && fontData->isSVGFont())
>                 renderingContext->drawSVGGlyphs(context, run, fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
>             else
>@@ -410,7 +410,7 @@ void Font::drawGlyphBuffer(GraphicsContext* context, const TextRun& run, const G
>         nextGlyph++;
>     }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (renderingContext && fontData->isSVGFont())
>         renderingContext->drawSVGGlyphs(context, run, fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
>     else
>diff --git a/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp b/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp
>index 87e93fd98ff8def094816a52434e9005e899959d..5d1ef5de2440adcc1bcd03308babb56dece691c9 100644
>--- a/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp
>+++ b/Source/WebCore/platform/graphics/GlyphPageTreeNode.cpp
>@@ -126,7 +126,7 @@ GlyphPageTreeNode::~GlyphPageTreeNode()
> 
> static bool fill(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
> {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (SimpleFontData::AdditionalFontData* additionalFontData = fontData->fontData())
>         return additionalFontData->fillSVGGlyphPage(pageToFill, offset, length, buffer, bufferLength, fontData);
> #endif
>diff --git a/Source/WebCore/platform/graphics/SVGGlyph.cpp b/Source/WebCore/platform/graphics/SVGGlyph.cpp
>index d5b7b987529785a483781a506a2a098a6459ebb3..6eefbfdd376095b6c658b189b922f6bf7471ea99 100644
>--- a/Source/WebCore/platform/graphics/SVGGlyph.cpp
>+++ b/Source/WebCore/platform/graphics/SVGGlyph.cpp
>@@ -20,7 +20,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGGlyph.h"
> 
> #include <wtf/unicode/Unicode.h>
>diff --git a/Source/WebCore/platform/graphics/SVGGlyph.h b/Source/WebCore/platform/graphics/SVGGlyph.h
>index 272811bb6be64fe5e4ca6813a3afda7470c16cb6..4a80234a3e6961769534f2d9c69c7fc70e03a014 100644
>--- a/Source/WebCore/platform/graphics/SVGGlyph.h
>+++ b/Source/WebCore/platform/graphics/SVGGlyph.h
>@@ -23,7 +23,7 @@
> #ifndef SVGGlyph_h
> #define SVGGlyph_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "Glyph.h"
> #include "Path.h"
> 
>@@ -109,5 +109,5 @@ bool isCompatibleGlyph(const SVGGlyph&, bool isVerticalText, const String& langu
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/platform/graphics/SimpleFontData.cpp b/Source/WebCore/platform/graphics/SimpleFontData.cpp
>index 4537ab90c3ff8ace2636279dbf0346e9a9ab7723..0f765e5474bf2b7b878f4ae218af7610e4951871 100644
>--- a/Source/WebCore/platform/graphics/SimpleFontData.cpp
>+++ b/Source/WebCore/platform/graphics/SimpleFontData.cpp
>@@ -134,7 +134,7 @@ void SimpleFontData::platformGlyphInit()
> 
> SimpleFontData::~SimpleFontData()
> {
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (!m_fontData)
> #endif
>         platformDestroy();
>diff --git a/Source/WebCore/platform/graphics/TextRun.h b/Source/WebCore/platform/graphics/TextRun.h
>index 029c708a68df374852eef8aa30a465ab887d8649..496a6da19ebedb0b88b66fdaff1e4827e4a76e47 100644
>--- a/Source/WebCore/platform/graphics/TextRun.h
>+++ b/Source/WebCore/platform/graphics/TextRun.h
>@@ -135,7 +135,7 @@ public:
>     public:
>         virtual ~RenderingContext() { }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>         virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIterator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) = 0;
>         virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const = 0;
>         virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, String& glyphName) const = 0;
>diff --git a/Source/WebCore/platform/graphics/WidthIterator.cpp b/Source/WebCore/platform/graphics/WidthIterator.cpp
>index d749a4f46805bcb42474c37c0547f1abb0d7a70d..5b54fa4e23c23daaa797aeed1b42eeb60a0bc05b 100644
>--- a/Source/WebCore/platform/graphics/WidthIterator.cpp
>+++ b/Source/WebCore/platform/graphics/WidthIterator.cpp
>@@ -72,7 +72,7 @@ GlyphData WidthIterator::glyphDataForCharacter(UChar32 character, bool mirror, i
> {
>     ASSERT(m_font);
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     if (TextRun::RenderingContext* renderingContext = m_run.renderingContext())
>         return renderingContext->glyphDataForCharacter(*m_font, m_run, *this, character, mirror, currentCharacter, advanceLength);
> #else
>diff --git a/Source/WebCore/platform/graphics/WidthIterator.h b/Source/WebCore/platform/graphics/WidthIterator.h
>index 60b9374024ed157ace816fdbd4969cefb69c8e77..f25018603c2865d202848b8aa6af55a167002b6a 100644
>--- a/Source/WebCore/platform/graphics/WidthIterator.h
>+++ b/Source/WebCore/platform/graphics/WidthIterator.h
>@@ -49,7 +49,7 @@ struct WidthIterator {
>     const TextRun& run() const { return m_run; }
>     float runWidthSoFar() const { return m_runWidthSoFar; }
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     String lastGlyphName() const { return m_lastGlyphName; }
>     void setLastGlyphName(const String& name) { m_lastGlyphName = name; }
>     Vector<SVGGlyph::ArabicForm>& arabicForms() { return m_arabicForms; }
>@@ -66,7 +66,7 @@ struct WidthIterator {
>     bool m_isAfterExpansion;
>     float m_finalRoundingWidth;
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
>     String m_lastGlyphName;
>     Vector<SVGGlyph::ArabicForm> m_arabicForms;
> #endif
>diff --git a/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp b/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
>index c1c5afa2543ae63329b85827ca9777dfa35b6123..6b712f694fc30350dac6b0dcfe52a83633107bdb 100644
>--- a/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
>+++ b/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
>@@ -387,12 +387,10 @@ bool SVGInlineTextBox::prepareGraphicsContextForTextPainting(GraphicsContext*& c
>     if (!acquiredResource)
>         return false;
> 
>-#if ENABLE(SVG_FONTS)
>     // SVG Fonts need access to the painting resource used to draw the current text chunk.
>     TextRun::RenderingContext* renderingContext = textRun.renderingContext();
>     if (renderingContext)
>         static_cast<SVGTextRunRenderingContext*>(renderingContext)->setActivePaintingResource(m_paintingResource);
>-#endif
> 
>     return true;
> }
>@@ -401,13 +399,9 @@ void SVGInlineTextBox::restoreGraphicsContextAfterTextPainting(GraphicsContext*&
> {
>     releasePaintingResource(context, /* path */0);
> 
>-#if ENABLE(SVG_FONTS)
>     TextRun::RenderingContext* renderingContext = textRun.renderingContext();
>     if (renderingContext)
>         static_cast<SVGTextRunRenderingContext*>(renderingContext)->setActivePaintingResource(0);
>-#else
>-    UNUSED_PARAM(textRun);
>-#endif
> }
> 
> TextRun SVGInlineTextBox::constructTextRun(RenderStyle* style, const SVGTextFragment& fragment) const
>diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
>index 753ff489510ec2e72b5adf0ccdb4e356fb885e40..42ed2b0f762b43d19cfc17b749f5fa62460dbf3f 100644
>--- a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
>+++ b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
>@@ -24,14 +24,10 @@
> 
> #include "Font.h"
> #include "SVGRenderStyle.h"
>-
>-#if ENABLE(SVG_FONTS)
> #include "SVGFontData.h"
> #include "SVGFontElement.h"
> #include "SVGFontFaceElement.h"
>-#else
>-#include <wtf/UnusedParam.h>
>-#endif
>+
> 
> namespace WebCore {
> 
>@@ -43,7 +39,6 @@ SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font)
> 
> float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, const SVGTextMetrics::Glyph& currentGlyph)
> {
>-#if ENABLE(SVG_FONTS)
>     const SimpleFontData* fontData = m_font.primaryFont();
>     if (!fontData->isSVGFont()) {
>         m_lastGlyph.isValid = false;
>@@ -75,11 +70,6 @@ float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, const
>     m_lastGlyph.isValid = true;
>     kerning *= m_font.size() / m_font.fontMetrics().unitsPerEm();
>     return kerning;
>-#else
>-    UNUSED_PARAM(isVerticalText);
>-    UNUSED_PARAM(currentGlyph);
>-    return false;
>-#endif
> }
> 
> float SVGTextLayoutEngineSpacing::calculateCSSKerningAndSpacing(const SVGRenderStyle* style, SVGElement* lengthContext, const UChar* currentCharacter)
>diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
>index 71d470737ccc5a1954eba4dc6d37b73b164f1fad..017c52453a5072586a7d88ce7d263728ea28de97 100644
>--- a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
>+++ b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
>@@ -42,9 +42,7 @@ private:
>     const Font& m_font;
>     const UChar* m_lastCharacter;
> 
>-#if ENABLE(SVG_FONTS)
>     SVGTextMetrics::Glyph m_lastGlyph;
>-#endif
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp b/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp
>index 33acf92dc960e7fb503e110123d0ddd9ee013258..a85be3793e2a37305c8d401bcfbf54b7c4abf6e0 100644
>--- a/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp
>+++ b/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp
>@@ -20,7 +20,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGTextRunRenderingContext.h"
> 
> #include "Font.h"
>diff --git a/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h b/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h
>index bb92bea8caf28ac21d75a91a3a4d2af6a80d0669..fc53934b8d357bdb160d1990edc09838c4ff62df 100644
>--- a/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h
>+++ b/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h
>@@ -38,31 +38,24 @@ public:
> 
>     RenderObject* renderer() const { return m_renderer; }
> 
>-#if ENABLE(SVG_FONTS)
>     RenderSVGResource* activePaintingResource() const { return m_activePaintingResource; }
>     void setActivePaintingResource(RenderSVGResource* object) { m_activePaintingResource = object; }
> 
>     virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIterator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength);
>     virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const;
>     virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, String& glyphName) const;
>-#endif
> 
> private:
>     SVGTextRunRenderingContext(RenderObject* renderer)
>         : m_renderer(renderer)
>-#if ENABLE(SVG_FONTS)
>         , m_activePaintingResource(0)
>-#endif
>     {
>     }
> 
>     virtual ~SVGTextRunRenderingContext() { }
> 
>     RenderObject* m_renderer;
>-
>-#if ENABLE(SVG_FONTS)
>     RenderSVGResource* m_activePaintingResource;
>-#endif
> };
> 
> inline bool textRunNeedsRenderingContext(const Font& font)
>diff --git a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
>index 4c0a00a6ae9f118d8920538032433eb4c1310649..9a9cbe54cd442a2e0b5948851a09a820b739f6a9 100644
>--- a/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
>+++ b/Source/WebCore/svg/SVGAltGlyphDefElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGAltGlyphDefElement.h"
> 
> #include "SVGAltGlyphItemElement.h"
>diff --git a/Source/WebCore/svg/SVGAltGlyphDefElement.h b/Source/WebCore/svg/SVGAltGlyphDefElement.h
>index ed45a25173c6c9526755984404411f87f515efe5..8ce92428bf734f1e2113d83ef8dca58709660e2c 100644
>--- a/Source/WebCore/svg/SVGAltGlyphDefElement.h
>+++ b/Source/WebCore/svg/SVGAltGlyphDefElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGAltGlyphDefElement_h
> #define SVGAltGlyphDefElement_h
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> #include <wtf/Vector.h>
> 
>diff --git a/Source/WebCore/svg/SVGAltGlyphDefElement.idl b/Source/WebCore/svg/SVGAltGlyphDefElement.idl
>index b4b44d2c2c297eeec63e81654931fe33fa443825..e03cce3fd698c4f75aad001d4b5cb7f959e466d7 100644
>--- a/Source/WebCore/svg/SVGAltGlyphDefElement.idl
>+++ b/Source/WebCore/svg/SVGAltGlyphDefElement.idl
>@@ -19,7 +19,7 @@
> 
> module svg {
> 
>-    interface [Conditional=SVG&SVG_FONTS] SVGAltGlyphDefElement : SVGElement {
>+    interface [Conditional=SVG] SVGAltGlyphDefElement : SVGElement {
>     };
> 
> }
>diff --git a/Source/WebCore/svg/SVGAltGlyphElement.cpp b/Source/WebCore/svg/SVGAltGlyphElement.cpp
>index a6ce49ac962623e961b3e66019ec609a90741109..3582dd516d1d3c5a56a578f64f7cab1783a8a9de 100644
>--- a/Source/WebCore/svg/SVGAltGlyphElement.cpp
>+++ b/Source/WebCore/svg/SVGAltGlyphElement.cpp
>@@ -22,7 +22,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGAltGlyphElement.h"
> 
> #include "ExceptionCode.h"
>diff --git a/Source/WebCore/svg/SVGAltGlyphElement.h b/Source/WebCore/svg/SVGAltGlyphElement.h
>index 0ba229c46179dc180548f51f4dc29ce79102cb1a..bf42c7a2c0eff1268b743977ec4f095852988a8b 100644
>--- a/Source/WebCore/svg/SVGAltGlyphElement.h
>+++ b/Source/WebCore/svg/SVGAltGlyphElement.h
>@@ -22,7 +22,7 @@
> #ifndef SVGAltGlyphElement_h
> #define SVGAltGlyphElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGTextPositioningElement.h"
> #include "SVGURIReference.h"
> #include <wtf/Vector.h>
>diff --git a/Source/WebCore/svg/SVGAltGlyphElement.idl b/Source/WebCore/svg/SVGAltGlyphElement.idl
>index 865dbdd8b53acba0b05ff4c8b9eabf4a93808d48..6393985899964cadf538f27fd6167f3eccdcf561 100644
>--- a/Source/WebCore/svg/SVGAltGlyphElement.idl
>+++ b/Source/WebCore/svg/SVGAltGlyphElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS,
>+        Conditional=SVG,
>     ] SVGAltGlyphElement : SVGTextPositioningElement, SVGURIReference {
>         attribute DOMString glyphRef
>             setter raises(DOMException);
>diff --git a/Source/WebCore/svg/SVGAltGlyphItemElement.cpp b/Source/WebCore/svg/SVGAltGlyphItemElement.cpp
>index cadbf5e5ab187ad6af4981653301c41cb2f3dd41..e3633991e658b8712780ec988879457f94e927a9 100644
>--- a/Source/WebCore/svg/SVGAltGlyphItemElement.cpp
>+++ b/Source/WebCore/svg/SVGAltGlyphItemElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGAltGlyphItemElement.h"
> 
> #include "SVGGlyphRefElement.h"
>diff --git a/Source/WebCore/svg/SVGAltGlyphItemElement.h b/Source/WebCore/svg/SVGAltGlyphItemElement.h
>index eaf5946ffb6c49c5cd70ff254e27134163c3fc5c..e401d423ba9d925eb3dcb8c38d57b7fac38e7526 100644
>--- a/Source/WebCore/svg/SVGAltGlyphItemElement.h
>+++ b/Source/WebCore/svg/SVGAltGlyphItemElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGAltGlyphItemElement_h
> #define SVGAltGlyphItemElement_h
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> #include <wtf/Vector.h>
> 
>diff --git a/Source/WebCore/svg/SVGAltGlyphItemElement.idl b/Source/WebCore/svg/SVGAltGlyphItemElement.idl
>index a98443ce89fc29bef761b3186cb281acc3e79357..da7d2599ffd77d2310642041c2a8196361b407f5 100644
>--- a/Source/WebCore/svg/SVGAltGlyphItemElement.idl
>+++ b/Source/WebCore/svg/SVGAltGlyphItemElement.idl
>@@ -19,7 +19,7 @@
> 
> module svg {
> 
>-    interface [Conditional=SVG&SVG_FONTS] SVGAltGlyphItemElement : SVGElement {
>+    interface [Conditional=SVG] SVGAltGlyphItemElement : SVGElement {
>     };
> 
> }
>diff --git a/Source/WebCore/svg/SVGFontData.cpp b/Source/WebCore/svg/SVGFontData.cpp
>index 340e2010c1643d0fc25dd15b4518c107ee8a07c1..ffe53e33f49a64af8a19772bbec60d9b81939e96 100644
>--- a/Source/WebCore/svg/SVGFontData.cpp
>+++ b/Source/WebCore/svg/SVGFontData.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontData.h"
> 
> #include "RenderObject.h"
>diff --git a/Source/WebCore/svg/SVGFontData.h b/Source/WebCore/svg/SVGFontData.h
>index 989b65afd83e1f6fdfcf06f49a05d05cd20550fa..aca648a8724376098007ffc4b8727be2b2001cc2 100644
>--- a/Source/WebCore/svg/SVGFontData.h
>+++ b/Source/WebCore/svg/SVGFontData.h
>@@ -20,7 +20,7 @@
> #ifndef SVGFontData_h
> #define SVGFontData_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SimpleFontData.h"
> #include "SVGFontFaceElement.h"
> 
>diff --git a/Source/WebCore/svg/SVGFontElement.cpp b/Source/WebCore/svg/SVGFontElement.cpp
>index 94e5b81fbfad5825690dc67e4f0c418d25fa158e..5e915563366a3774ff9eda38f52491afd09f97ca 100644
>--- a/Source/WebCore/svg/SVGFontElement.cpp
>+++ b/Source/WebCore/svg/SVGFontElement.cpp
>@@ -21,7 +21,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontElement.h"
> 
> #include "Document.h"
>@@ -259,4 +259,4 @@ Glyph SVGFontElement::missingGlyph()
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGFontElement.h b/Source/WebCore/svg/SVGFontElement.h
>index 849179e764b1d105befc48691c08c64a1010244a..dd7492096808aa8b5948e388e5607cc134bffff6 100644
>--- a/Source/WebCore/svg/SVGFontElement.h
>+++ b/Source/WebCore/svg/SVGFontElement.h
>@@ -22,7 +22,7 @@
> #ifndef SVGFontElement_h
> #define SVGFontElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGAnimatedBoolean.h"
> #include "SVGExternalResourcesRequired.h"
> #include "SVGGlyphElement.h"
>@@ -91,5 +91,5 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/svg/SVGFontElement.idl b/Source/WebCore/svg/SVGFontElement.idl
>index 0b95d0f257722e420e68138336b5c129c3f2e216..fb1c05422e0d206f56f60a4b884637a7c317c21d 100644
>--- a/Source/WebCore/svg/SVGFontElement.idl
>+++ b/Source/WebCore/svg/SVGFontElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGFontFaceElement.cpp b/Source/WebCore/svg/SVGFontFaceElement.cpp
>index 770a686cf4fb93c3344efd3e1f835d3d739b00c3..4e989698382167c940e08fd375be080244381757 100644
>--- a/Source/WebCore/svg/SVGFontFaceElement.cpp
>+++ b/Source/WebCore/svg/SVGFontFaceElement.cpp
>@@ -21,7 +21,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontFaceElement.h"
> 
> #include "Attribute.h"
>@@ -354,4 +354,4 @@ void SVGFontFaceElement::removeFromMappedElementSheet()
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGFontFaceElement.h b/Source/WebCore/svg/SVGFontFaceElement.h
>index 168f21c8761e9868053a63b422cc2178a205ac84..6fa2be9bc5db519879de927e376de81622f3f7a0 100644
>--- a/Source/WebCore/svg/SVGFontFaceElement.h
>+++ b/Source/WebCore/svg/SVGFontFaceElement.h
>@@ -22,7 +22,7 @@
> #ifndef SVGFontFaceElement_h
> #define SVGFontFaceElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> 
> namespace WebCore {
>@@ -68,7 +68,7 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
> 
> // vim:ts=4:noet
>diff --git a/Source/WebCore/svg/SVGFontFaceElement.idl b/Source/WebCore/svg/SVGFontFaceElement.idl
>index 1eed0e27dbd4a48932a46365488b1779e787298a..2c71ccc71adf26af5c09db627adb4fe26038ebf6 100644
>--- a/Source/WebCore/svg/SVGFontFaceElement.idl
>+++ b/Source/WebCore/svg/SVGFontFaceElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontFaceElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGFontFaceFormatElement.cpp b/Source/WebCore/svg/SVGFontFaceFormatElement.cpp
>index 96cfadfbd88209e75d5feae0f019562a03aad674..dd29a003031b2dc7781523ee3a08b59d8a53ab19 100644
>--- a/Source/WebCore/svg/SVGFontFaceFormatElement.cpp
>+++ b/Source/WebCore/svg/SVGFontFaceFormatElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontFaceFormatElement.h"
> 
> #include "SVGFontFaceElement.h"
>@@ -58,4 +58,4 @@ void SVGFontFaceFormatElement::childrenChanged(bool changedByParser, Node* befor
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGFontFaceFormatElement.h b/Source/WebCore/svg/SVGFontFaceFormatElement.h
>index 6ca6c1fca4ebedf3f980c030b9aeb1db40b4f76a..091a2e6e818368ea21cf30043ed385e052a342b4 100644
>--- a/Source/WebCore/svg/SVGFontFaceFormatElement.h
>+++ b/Source/WebCore/svg/SVGFontFaceFormatElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGFontFaceFormatElement_h
> #define SVGFontFaceFormatElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> 
> namespace WebCore {
>@@ -37,7 +37,7 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
> 
> // vim:ts=4:noet
>diff --git a/Source/WebCore/svg/SVGFontFaceFormatElement.idl b/Source/WebCore/svg/SVGFontFaceFormatElement.idl
>index a0848b988063b866923549a908cf06269e714bd5..25db7d611360ad7265bcab3263f24e1a4198882b 100644
>--- a/Source/WebCore/svg/SVGFontFaceFormatElement.idl
>+++ b/Source/WebCore/svg/SVGFontFaceFormatElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontFaceFormatElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGFontFaceNameElement.cpp b/Source/WebCore/svg/SVGFontFaceNameElement.cpp
>index 9849fdcfbcb17799dbc3244cc4e1064ff32ef6ad..a062639c965c7bbd98dfad28f024292173905d47 100644
>--- a/Source/WebCore/svg/SVGFontFaceNameElement.cpp
>+++ b/Source/WebCore/svg/SVGFontFaceNameElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontFaceNameElement.h"
> 
> #include "CSSFontFaceSrcValue.h"
>diff --git a/Source/WebCore/svg/SVGFontFaceNameElement.h b/Source/WebCore/svg/SVGFontFaceNameElement.h
>index e99d2d5bde2da365d49854d7b99ced2ff2bd58da..3515b9f05bf2369a747aa5aacc37636145c4261b 100644
>--- a/Source/WebCore/svg/SVGFontFaceNameElement.h
>+++ b/Source/WebCore/svg/SVGFontFaceNameElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGFontFaceNameElement_h
> #define SVGFontFaceNameElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> 
> namespace WebCore {
>@@ -39,7 +39,7 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
> 
> // vim:ts=4:noet
>diff --git a/Source/WebCore/svg/SVGFontFaceNameElement.idl b/Source/WebCore/svg/SVGFontFaceNameElement.idl
>index 8407ccf9d10caefcc4272cb98afd8bf55c2935f3..5f4b4b1c918ebe78b09c4703ea06903b2c63833c 100644
>--- a/Source/WebCore/svg/SVGFontFaceNameElement.idl
>+++ b/Source/WebCore/svg/SVGFontFaceNameElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontFaceNameElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGFontFaceSrcElement.cpp b/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
>index 40f58b76d22a50af17ffadae87e993e818015989..553b4a10ad2e7a38c5ad560cfe78b54d9f14a9ce 100644
>--- a/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
>+++ b/Source/WebCore/svg/SVGFontFaceSrcElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontFaceSrcElement.h"
> 
> #include "CSSFontFaceSrcValue.h"
>@@ -68,4 +68,4 @@ void SVGFontFaceSrcElement::childrenChanged(bool changedByParser, Node* beforeCh
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGFontFaceSrcElement.h b/Source/WebCore/svg/SVGFontFaceSrcElement.h
>index 5e276258aad428222124feec56118866008da345..b70029088d3687ec43a64d066bd43bb0bc40413e 100644
>--- a/Source/WebCore/svg/SVGFontFaceSrcElement.h
>+++ b/Source/WebCore/svg/SVGFontFaceSrcElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGFontFaceSrcElement_h
> #define SVGFontFaceSrcElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGElement.h"
> 
> namespace WebCore {
>@@ -41,7 +41,7 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
> 
> // vim:ts=4:noet
>diff --git a/Source/WebCore/svg/SVGFontFaceSrcElement.idl b/Source/WebCore/svg/SVGFontFaceSrcElement.idl
>index 77af8cdaedbf160fca18ea275719f191183d65d3..db6b7753d8000d6384097a5a051695239f030867 100644
>--- a/Source/WebCore/svg/SVGFontFaceSrcElement.idl
>+++ b/Source/WebCore/svg/SVGFontFaceSrcElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontFaceSrcElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGFontFaceUriElement.cpp b/Source/WebCore/svg/SVGFontFaceUriElement.cpp
>index ac3b988e3b10e7e557f407a0ad19006c229e76e6..9a53f07a8081f3789557088da944c6aba3f0ffbc 100644
>--- a/Source/WebCore/svg/SVGFontFaceUriElement.cpp
>+++ b/Source/WebCore/svg/SVGFontFaceUriElement.cpp
>@@ -20,7 +20,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontFaceUriElement.h"
> 
> #include "Attribute.h"
>@@ -108,4 +108,4 @@ void SVGFontFaceUriElement::loadFont()
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGFontFaceUriElement.h b/Source/WebCore/svg/SVGFontFaceUriElement.h
>index 380631591f2e80ab1c7b656b66578c42536697b2..503683d5f7447e67b1911d5dc0c4dfb439575720 100644
>--- a/Source/WebCore/svg/SVGFontFaceUriElement.h
>+++ b/Source/WebCore/svg/SVGFontFaceUriElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGFontFaceUriElement_h
> #define SVGFontFaceUriElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "CachedResourceClient.h"
> #include "CachedResourceHandle.h"
> #include "SVGElement.h"
>@@ -52,7 +52,7 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
> 
> // vim:ts=4:noet
>diff --git a/Source/WebCore/svg/SVGFontFaceUriElement.idl b/Source/WebCore/svg/SVGFontFaceUriElement.idl
>index b4f626a6825b02620e63a8296d24d44526a6b749..718a15749a6d669c95f56247df5b44b320a7535d 100644
>--- a/Source/WebCore/svg/SVGFontFaceUriElement.idl
>+++ b/Source/WebCore/svg/SVGFontFaceUriElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGFontFaceUriElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGGlyphElement.cpp b/Source/WebCore/svg/SVGGlyphElement.cpp
>index 09000bb74bd10c1e1f7d408561f7adf290492780..1d86453fc6ee5de8e241424116b6b506db8a82bf 100644
>--- a/Source/WebCore/svg/SVGGlyphElement.cpp
>+++ b/Source/WebCore/svg/SVGGlyphElement.cpp
>@@ -21,7 +21,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGGlyphElement.h"
> 
> #include "Attribute.h"
>@@ -174,4 +174,4 @@ SVGGlyph SVGGlyphElement::buildGlyphIdentifier() const
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGGlyphElement.h b/Source/WebCore/svg/SVGGlyphElement.h
>index 60be413e5a53df9800a1ba5896adfa321e934b46..0e8e48962a03e4de186c87fca4d6ecc31c386907 100644
>--- a/Source/WebCore/svg/SVGGlyphElement.h
>+++ b/Source/WebCore/svg/SVGGlyphElement.h
>@@ -22,7 +22,7 @@
> #ifndef SVGGlyphElement_h
> #define SVGGlyphElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGGlyph.h"
> #include "SVGStyledElement.h"
> 
>@@ -59,5 +59,5 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/svg/SVGGlyphElement.idl b/Source/WebCore/svg/SVGGlyphElement.idl
>index d00309c35fbda8f7de62e093fd858ad3abcbcd38..59d84556ed7c232c16ac19a19f5f2da1e5a8b35d 100644
>--- a/Source/WebCore/svg/SVGGlyphElement.idl
>+++ b/Source/WebCore/svg/SVGGlyphElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGGlyphElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGGlyphMap.h b/Source/WebCore/svg/SVGGlyphMap.h
>index 929452696591d7a70b4b1a77eb0467c72dd38442..e4c9fa136169262f6b34b40e05aabe5194a8e21d 100644
>--- a/Source/WebCore/svg/SVGGlyphMap.h
>+++ b/Source/WebCore/svg/SVGGlyphMap.h
>@@ -20,7 +20,7 @@
> #ifndef SVGGlyphMap_h
> #define SVGGlyphMap_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SurrogatePairAwareTextIterator.h"
> #include "SVGGlyph.h"
> #include "SVGGlyphElement.h"
>@@ -162,5 +162,5 @@ private:
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif // SVGGlyphMap_h
>diff --git a/Source/WebCore/svg/SVGGlyphRefElement.cpp b/Source/WebCore/svg/SVGGlyphRefElement.cpp
>index cec11aebe91418a8840874e5a62e06ff3aab288b..b5be51e1bf47c4fccc4b5f53e74812d49d664697 100644
>--- a/Source/WebCore/svg/SVGGlyphRefElement.cpp
>+++ b/Source/WebCore/svg/SVGGlyphRefElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGGlyphRefElement.h"
> 
> #include "SVGGlyphElement.h"
>diff --git a/Source/WebCore/svg/SVGGlyphRefElement.h b/Source/WebCore/svg/SVGGlyphRefElement.h
>index d709e01cd3fe1fff240cdb9f6fb4cfcaf10938e8..68573e554527e73f3f4096504a74cc14ec910b85 100644
>--- a/Source/WebCore/svg/SVGGlyphRefElement.h
>+++ b/Source/WebCore/svg/SVGGlyphRefElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGGlyphRefElement_h
> #define SVGGlyphRefElement_h
> 
>-#if ENABLE(SVG) && ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGStyledElement.h"
> #include "SVGURIReference.h"
> 
>diff --git a/Source/WebCore/svg/SVGGlyphRefElement.idl b/Source/WebCore/svg/SVGGlyphRefElement.idl
>index 6d7af76761ece5e5d7e4063646277824a070eb68..d3e396ddf962e305c9dab8916b7b0a643236ce9d 100644
>--- a/Source/WebCore/svg/SVGGlyphRefElement.idl
>+++ b/Source/WebCore/svg/SVGGlyphRefElement.idl
>@@ -19,7 +19,7 @@
> 
> module svg {
> 
>-    interface [Conditional=SVG&SVG_FONTS] SVGGlyphRefElement : SVGElement,
>+    interface [Conditional=SVG] SVGGlyphRefElement : SVGElement,
>                                                                SVGURIReference,
>                                                                SVGStylable {
>         // FIXME: Use [Reflect] after https://bugs.webkit.org/show_bug.cgi?id=64843 is fixed.
>diff --git a/Source/WebCore/svg/SVGHKernElement.cpp b/Source/WebCore/svg/SVGHKernElement.cpp
>index 8ba474aee5ba294ad5bcc9a77630de5389696f0e..1f5b202ba6ebd50f4cab02d38720ce8a4abe334e 100644
>--- a/Source/WebCore/svg/SVGHKernElement.cpp
>+++ b/Source/WebCore/svg/SVGHKernElement.cpp
>@@ -21,7 +21,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGHKernElement.h"
> 
> #include "SVGFontElement.h"
>@@ -82,4 +82,4 @@ void SVGHKernElement::buildHorizontalKerningPair(KerningPairVector& kerningPairs
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGHKernElement.h b/Source/WebCore/svg/SVGHKernElement.h
>index bc7b4e83fc45fed04ca13b1b078fb5e3ac9cab2e..bedf6d0017dc32f3960a0d839153c5e37778a1a4 100644
>--- a/Source/WebCore/svg/SVGHKernElement.h
>+++ b/Source/WebCore/svg/SVGHKernElement.h
>@@ -22,7 +22,7 @@
> #ifndef SVGHKernElement_h
> #define SVGHKernElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontElement.h"
> 
> namespace WebCore {
>@@ -44,5 +44,5 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/svg/SVGHKernElement.idl b/Source/WebCore/svg/SVGHKernElement.idl
>index 4087749ace4be60da9b6297acff4121ad3de9b39..78c3742cbdaef65ba62f2dfa43bbeb4c549ea755 100644
>--- a/Source/WebCore/svg/SVGHKernElement.idl
>+++ b/Source/WebCore/svg/SVGHKernElement.idl
>@@ -20,7 +20,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGHKernElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGMissingGlyphElement.cpp b/Source/WebCore/svg/SVGMissingGlyphElement.cpp
>index 5c98015c760386a27653b6ba679e807fdbc42a1f..ef1e03e5ffd6024392daa0b2cf529429226fecca 100644
>--- a/Source/WebCore/svg/SVGMissingGlyphElement.cpp
>+++ b/Source/WebCore/svg/SVGMissingGlyphElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGMissingGlyphElement.h"
> #include "SVGNames.h"
> 
>@@ -38,4 +38,4 @@ PassRefPtr<SVGMissingGlyphElement> SVGMissingGlyphElement::create(const Qualifie
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGMissingGlyphElement.h b/Source/WebCore/svg/SVGMissingGlyphElement.h
>index d726c0d7adb88af4c81ea823aee39bb2e341083e..672a40f79a84cc39d88586d609fedd1eacfad44f 100644
>--- a/Source/WebCore/svg/SVGMissingGlyphElement.h
>+++ b/Source/WebCore/svg/SVGMissingGlyphElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGMissingGlyphElement_h
> #define SVGMissingGlyphElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGStyledElement.h"
> 
> namespace WebCore {
>@@ -37,5 +37,5 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/svg/SVGMissingGlyphElement.idl b/Source/WebCore/svg/SVGMissingGlyphElement.idl
>index 5e3074bfa20a94a2f21afe6e3a376b441d397ff3..7d56865be3776eab39a9895d3be7f4f74496834a 100644
>--- a/Source/WebCore/svg/SVGMissingGlyphElement.idl
>+++ b/Source/WebCore/svg/SVGMissingGlyphElement.idl
>@@ -26,7 +26,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGMissingGlyphElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/SVGTRefElement.cpp b/Source/WebCore/svg/SVGTRefElement.cpp
>index ca86d023b98eb26f4e46839df44b8689bb9b38e2..d5f7d866cab63c347ba79799a70e3919290a496f 100644
>--- a/Source/WebCore/svg/SVGTRefElement.cpp
>+++ b/Source/WebCore/svg/SVGTRefElement.cpp
>@@ -218,9 +218,7 @@ bool SVGTRefElement::rendererIsNeeded(const NodeRenderingContext& context)
> {
>     if (parentNode()
>         && (parentNode()->hasTagName(SVGNames::aTag)
>-#if ENABLE(SVG_FONTS)
>             || parentNode()->hasTagName(SVGNames::altGlyphTag)
>-#endif
>             || parentNode()->hasTagName(SVGNames::textTag)
>             || parentNode()->hasTagName(SVGNames::textPathTag)
>             || parentNode()->hasTagName(SVGNames::tspanTag)))
>diff --git a/Source/WebCore/svg/SVGTSpanElement.cpp b/Source/WebCore/svg/SVGTSpanElement.cpp
>index 3219e6533d15e614c51d0212c6d8b1464c6d674e..98cef8b91c80599141091c83d55ace4159d9eabb 100644
>--- a/Source/WebCore/svg/SVGTSpanElement.cpp
>+++ b/Source/WebCore/svg/SVGTSpanElement.cpp
>@@ -49,9 +49,7 @@ bool SVGTSpanElement::childShouldCreateRenderer(Node* child) const
> {
>     if (child->isTextNode()
>         || child->hasTagName(SVGNames::aTag)
>-#if ENABLE(SVG_FONTS)
>         || child->hasTagName(SVGNames::altGlyphTag)
>-#endif
>         || child->hasTagName(SVGNames::trefTag)
>         || child->hasTagName(SVGNames::tspanTag))
>         return true;
>@@ -63,9 +61,7 @@ bool SVGTSpanElement::rendererIsNeeded(const NodeRenderingContext& context)
> {
>     if (parentNode()
>         && (parentNode()->hasTagName(SVGNames::aTag)
>-#if ENABLE(SVG_FONTS)
>             || parentNode()->hasTagName(SVGNames::altGlyphTag)
>-#endif
>             || parentNode()->hasTagName(SVGNames::textTag)
>             || parentNode()->hasTagName(SVGNames::textPathTag)
>             || parentNode()->hasTagName(SVGNames::tspanTag)))
>diff --git a/Source/WebCore/svg/SVGTextContentElement.cpp b/Source/WebCore/svg/SVGTextContentElement.cpp
>index a6483f4fa3b53fbee63ac8a0b96c9f10b724be54..a39cd2ae43d208a157575ec651a6f71add87e109 100644
>--- a/Source/WebCore/svg/SVGTextContentElement.cpp
>+++ b/Source/WebCore/svg/SVGTextContentElement.cpp
>@@ -298,9 +298,7 @@ SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject*
> 
>     if (!node->hasTagName(SVGNames::textTag)
>         && !node->hasTagName(SVGNames::tspanTag)
>-#if ENABLE(SVG_FONTS)
>         && !node->hasTagName(SVGNames::altGlyphTag)
>-#endif
>         && !node->hasTagName(SVGNames::trefTag)
>         && !node->hasTagName(SVGNames::textPathTag))
>         return 0;
>diff --git a/Source/WebCore/svg/SVGTextElement.cpp b/Source/WebCore/svg/SVGTextElement.cpp
>index 10c7289ac065b9c76753ea9c51616a2317068589..7a75577696738108af1da4f5015d91f3690ed950 100644
>--- a/Source/WebCore/svg/SVGTextElement.cpp
>+++ b/Source/WebCore/svg/SVGTextElement.cpp
>@@ -133,9 +133,7 @@ bool SVGTextElement::childShouldCreateRenderer(Node* child) const
> {
>     if (child->isTextNode()
>         || child->hasTagName(SVGNames::aTag)
>-#if ENABLE(SVG_FONTS)
>         || child->hasTagName(SVGNames::altGlyphTag)
>-#endif
>         || child->hasTagName(SVGNames::textPathTag)
>         || child->hasTagName(SVGNames::trefTag)
>         || child->hasTagName(SVGNames::tspanTag))
>diff --git a/Source/WebCore/svg/SVGTextPositioningElement.cpp b/Source/WebCore/svg/SVGTextPositioningElement.cpp
>index 39713f0c33c16add2464298c31ff476d8ef1e567..70652f860a6025a875ab256232f5e194de513c03 100644
>--- a/Source/WebCore/svg/SVGTextPositioningElement.cpp
>+++ b/Source/WebCore/svg/SVGTextPositioningElement.cpp
>@@ -163,9 +163,7 @@ SVGTextPositioningElement* SVGTextPositioningElement::elementFromRenderer(Render
> 
>     if (!node->hasTagName(SVGNames::textTag)
>         && !node->hasTagName(SVGNames::tspanTag)
>-#if ENABLE(SVG_FONTS)
>         && !node->hasTagName(SVGNames::altGlyphTag)
>-#endif
>         && !node->hasTagName(SVGNames::trefTag))
>         return 0;
> 
>diff --git a/Source/WebCore/svg/SVGVKernElement.cpp b/Source/WebCore/svg/SVGVKernElement.cpp
>index 29238cac0504f8b8d00340e55bac7207e8c2cd9a..1bcf6b315886c4c4fc4c30fad26391be889289c3 100644
>--- a/Source/WebCore/svg/SVGVKernElement.cpp
>+++ b/Source/WebCore/svg/SVGVKernElement.cpp
>@@ -19,7 +19,7 @@
> 
> #include "config.h"
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGVKernElement.h"
> 
> #include "SVGFontElement.h"
>@@ -80,4 +80,4 @@ void SVGVKernElement::buildVerticalKerningPair(KerningPairVector& kerningPairs)
> 
> }
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
>diff --git a/Source/WebCore/svg/SVGVKernElement.h b/Source/WebCore/svg/SVGVKernElement.h
>index 01f06701c81dc77988a12185f3e04918fde52d0b..23a64a0da6b21d5ffb4b67ac9e2f7e13c962aa58 100644
>--- a/Source/WebCore/svg/SVGVKernElement.h
>+++ b/Source/WebCore/svg/SVGVKernElement.h
>@@ -20,7 +20,7 @@
> #ifndef SVGVKernElement_h
> #define SVGVKernElement_h
> 
>-#if ENABLE(SVG_FONTS)
>+#if ENABLE(SVG)
> #include "SVGFontElement.h"
> #include "SVGParserUtilities.h"
> #include "SVGStyledElement.h"
>@@ -47,5 +47,5 @@ private:
> 
> } // namespace WebCore
> 
>-#endif // ENABLE(SVG_FONTS)
>+#endif // ENABLE(SVG)
> #endif
>diff --git a/Source/WebCore/svg/SVGVKernElement.idl b/Source/WebCore/svg/SVGVKernElement.idl
>index 7fe8dc29c8ae48decfb6c454bb015be3662219ab..13aa246e92d9b384c9f3719644976f7f711f407a 100644
>--- a/Source/WebCore/svg/SVGVKernElement.idl
>+++ b/Source/WebCore/svg/SVGVKernElement.idl
>@@ -20,7 +20,7 @@
> module svg {
> 
>     interface [
>-        Conditional=SVG&SVG_FONTS
>+        Conditional=SVG
>     ] SVGVKernElement : SVGElement {
>     };
> 
>diff --git a/Source/WebCore/svg/svgtags.in b/Source/WebCore/svg/svgtags.in
>index e12a5542fc6ed914981d456f5efffd25f38fc7b7..73e0417ffba82e5c7bf13aebbed2ab5f1c593529 100644
>--- a/Source/WebCore/svg/svgtags.in
>+++ b/Source/WebCore/svg/svgtags.in
>@@ -4,11 +4,9 @@ guardFactoryWith="ENABLE(SVG)"
> fallbackInterfaceName="SVGElement"
> 
> a
>-#if ENABLE_SVG_FONTS
> altGlyph
> altGlyphDef
> altGlyphItem
>-#endif
> animate
> animateColor
> animateMotion JSInterfaceName=SVGElement
>@@ -51,30 +49,24 @@ feTile
> feTurbulence
> filter
> #endif
>-#if ENABLE_SVG_FONTS
> font
> font_face
> font_face_format
> font_face_name
> font_face_src
> font_face_uri
>-#endif
> foreignObject
> g
>-#if ENABLE_SVG_FONTS
> glyph
> glyphRef
> hkern interfaceName=SVGHKernElement, JSInterfaceName=SVGElement
>-#endif
> image
> line
> linearGradient
> marker
> mask
> metadata
>-#if ENABLE_SVG_FONTS
> missing_glyph
>-#endif
> mpath interfaceName=SVGMPathElement, JSInterfaceName=SVGElement
> path
> pattern
>@@ -95,6 +87,4 @@ tref interfaceName=SVGTRefElement
> tspan interfaceName=SVGTSpanElement
> use
> view
>-#if ENABLE_SVG_FONTS
> vkern interfaceName=SVGVKernElement
>-#endif
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 3b5327c245489127357abacacb43293a420c9cc3..600de7561d6f85a6ea2a73e9b628d98c17f6d524 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * features.gypi:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index b73e643d89df37096b5b6da3932c7eccbc91663d..2b2c1191a422176df87b05753d246fc85e55bfbc 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -79,7 +79,6 @@
>       'ENABLE_SMOOTH_SCROLLING=1',
>       'ENABLE_SVG=<(enable_svg)',
>       'ENABLE_SVG_AS_IMAGE=<(enable_svg)',
>-      'ENABLE_SVG_FONTS=<(enable_svg)',
>       'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
>       'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
>       'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index 5958c1e554422de35f2f35e660e67be5819d6152..f324078eb42467b7f653a9719d96fad34c17dc4c 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index 85658030405616a8ae1c28025cfed7386174534b..58f8ef93e2299ae5b6d4b7a786bb9b7b59786936 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -84,7 +84,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
> ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
> ENABLE_SVG = ENABLE_SVG;
> ENABLE_SVG_AS_IMAGE = ENABLE_SVG_AS_IMAGE;
>-ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
> ENABLE_TOUCH_ICON_LOADING = ;
> ENABLE_VIDEO = ENABLE_VIDEO;
> ENABLE_VIDEO_TRACK = ;
>@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
> ENABLE_XPATH = ENABLE_XPATH;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 80a3bb146af9e3b334ae6b1974edb416e59ea446..3b678388b5fab10a4261e8038419472dca244524 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,12 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index 85658030405616a8ae1c28025cfed7386174534b..58f8ef93e2299ae5b6d4b7a786bb9b7b59786936 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -84,7 +84,6 @@ ENABLE_REQUEST_ANIMATION_FRAME = ENABLE_REQUEST_ANIMATION_FRAME;
> ENABLE_SHARED_WORKERS = ENABLE_SHARED_WORKERS;
> ENABLE_SVG = ENABLE_SVG;
> ENABLE_SVG_AS_IMAGE = ENABLE_SVG_AS_IMAGE;
>-ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
> ENABLE_TOUCH_ICON_LOADING = ;
> ENABLE_VIDEO = ENABLE_VIDEO;
> ENABLE_VIDEO_TRACK = ;
>@@ -97,4 +96,4 @@ ENABLE_XHTMLMP = ;
> ENABLE_XPATH = ENABLE_XPATH;
> ENABLE_XSLT = ENABLE_XSLT;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_Wwarning: LF will be replaced by CRLF in WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops.
>The file will have its original line endings in your working directory.
>warning: LF will be replaced by CRLF in WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops.
>The file will have its original line endings in your working directory.
>EBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
>diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
>index ecc99927f164a7923d7f9c70a9577d1bff9ab2e1..1c09cfd265bb2a8773e55630542f5ede21cea2d5 100644
>--- a/Source/cmake/OptionsEfl.cmake
>+++ b/Source/cmake/OptionsEfl.cmake
>@@ -89,7 +89,6 @@ WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF
> WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT ON)
> WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
> WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
>-WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
> WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
> WEBKIT_FEATURE(ENABLE_TOUCH_ICON_LOADING "Enable Touch Icon Loading" DEFAULT OFF)
> WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON HTML)
>diff --git a/Source/cmake/OptionsWinCE.cmake b/Source/cmake/OptionsWinCE.cmake
>index 13ff21611c2281fee38735a11640f9dfcf7f0123..2e05b8c4439e18b2dd358f2ffdd6a1e6ce09722a 100644
>--- a/Source/cmake/OptionsWinCE.cmake
>+++ b/Source/cmake/OptionsWinCE.cmake
>@@ -46,7 +46,6 @@ WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF
> WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT OFF)
> WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT OFF)
> WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
>-WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON SVG)
> WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
> WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF HTML)
> WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 810d7d143eed15530207a2b3630f228d2659c4a4..f3ef554eab8da8f9ff0d269e4272d265f6f24124 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -35,7 +35,6 @@
> #cmakedefine01 ENABLE_PROGRESS_TAG
> #cmakedefine01 ENABLE_SHARED_WORKERS
> #cmakedefine01 ENABLE_SVG
>-#cmakedefine01 ENABLE_SVG_FONTS
> #cmakedefine01 ENABLE_TOUCH_EVENTS
> #cmakedefine01 ENABLE_TOUCH_ICON_LOADING
> #cmakedefine01 ENABLE_VIDEO
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f57bf4b53309bd343c3fdfa334282ef0919e348d..7d74cb8508ad76ac3195fe85392a004dc27d6fda 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/build-webkit:
>+        * waf/build/settings.py:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
>index c67b276e7bdd03aa774d19134a59c1c283776264..b322cdb8e520b0ada1ad99bc81473f0004559be5 100755
>--- a/Tools/Scripts/build-webkit
>+++ b/Tools/Scripts/build-webkit
>@@ -111,7 +111,6 @@ my (
>     $svgSupport,
>     $svgAsImageSupport,
>     $svgDOMObjCBindingsSupport,
>-    $svgFontsSupport,
>     $systemMallocSupport,
>     $tiledBackingStoreSupport,
>     $touchEventsSupport,
>@@ -273,9 +272,6 @@ my @features = (
>     { option => "svg-dom-objc-bindings", desc => "Toggle SVG DOM Objective-C bindings support (implies SVG support)",
>       define => "ENABLE_SVG_DOM_OBJC_BINDINGS", default => isAppleMacWebKit(), value => \$svgDOMObjCBindingsSupport },
> 
>-    { option => "svg-fonts", desc => "Toggle SVG fonts support (imples SVG support)",
>-      define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
>-
>     { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
>       define => "ENABLE_TILED_BACKING_STORE", default => isQt(), value => \$tiledBackingStoreSupport },
> 
>@@ -345,8 +341,7 @@ foreach (@features) {
>     ${$_->{value}} = ($_->{default} && !$minimal) || 0;
> }
> 
>-$svgSupport = $svgSupport || $svgAsImageSupport
>-    || $svgDOMObjCBindingsSupport || $svgFontsSupport;
>+$svgSupport = $svgSupport || $svgAsImageSupport || $svgDOMObjCBindingsSupport;
> 
> $blobSupport = $blobSupport || $mediaStreamSupport;
> 
>diff --git a/Tools/waf/build/settings.py b/Tools/waf/build/settings.py
>index 8fbc930d3c1c240b0bd56a44e39921d9db7a6de8..12ddb451d8e7ecbd000d8c21d92ce262f6615ccc 100644
>--- a/Tools/waf/build/settings.py
>+++ b/Tools/waf/build/settings.py
>@@ -239,8 +239,7 @@ def common_configure(conf):
>     build_port = Options.options.port
> 
>     feature_defines = ['ENABLE_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER',
>-                    'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS',
>-                    'ENABLE_SVG_AS_IMAGE',
>+                    'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_AS_IMAGE',
>                     'ENABLE_DOM_STORAGE', 'BUILDING_%s' % build_port.upper()]
> 
>     conf.env["FEATURE_DEFINES"] = ' '.join(feature_defines)
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index c7bf85683103a37ae83410c010d982aa3ca23036..f48e39e6b1fc19e6dc31dd6f25ad4f83c52a58cc 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -1,3 +1,13 @@
>+2011-09-15  Eric Seidel  <eric@webkit.org>
>+
>+        Remove SVG_FONTS define as it's enabled on all major ports
>+        https://bugs.webkit.org/show_bug.cgi?id=68179
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * win/tools/vsprops/FeatureDefines.vsprops:
>+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
>+
> 2011-09-13  Eric Seidel  <eric@webkit.org>
> 
>         Remove ENABLE_SVG_ANIMATION as all major ports have it on by default
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>index 27573020e74bb280050c9092fc18dc3f68da5bc1..b1ae9c63e9874763ca9410a89a06cf2c839d3265 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
>@@ -9,7 +9,7 @@
> 	>
>   <Tool
> 		Name="VCCLCompilerTool"
>-		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
>+		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
> 	/>
>   <UserMacro
> 		Name="ENABLE_3D_CANVAS"
>@@ -212,11 +212,6 @@
> 		PerformEnvironmentSet="true"
> 	/>
>   <UserMacro
>-		Name="ENABLE_SVG_FONTS"
>-		Value="ENABLE_SVG_FONTS"
>-		PerformEnvironmentSet="true"
>-	/>
>-  <UserMacro
> 		Name="ENABLE_VIDEO"
> 		Value="ENABLE_VIDEO"
> 		PerformEnvironmentSet="true"
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>index a8bd591a90cdd195e5a43d48fe6604eedb0a10aa..a0267089b3d58944a621c7e99ec1d5648bf79298 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
>@@ -9,7 +9,7 @@
> 	>
>   <Tool
> 		Name="VCCLCompilerTool"
>-		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
>+		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
> 	/>
>   <UserMacro
> 		Name="ENABLE_3D_CANVAS"
>@@ -212,11 +212,6 @@
> 		PerformEnvironmentSet="true"
> 	/>
>   <UserMacro
>-		Name="ENABLE_SVG_FONTS"
>-		Value="ENABLE_SVG_FONTS"
>-		PerformEnvironmentSet="true"
>-	/>
>-  <UserMacro
> 		Name="ENABLE_VIDEO"
> 		Value=""
> 		PerformEnvironmentSet="true"
>diff --git a/configure.ac b/configure.ac
>index 65a0172e0a3ce7ff72a880dc3e066e1e6c057376..80ea9c943a0b05fb468fc219348296ee074c5b73 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -701,7 +701,6 @@ AC_MSG_RESULT([$enable_quota])
> 
> # turn off svg features if --disable-svg is requested
> if test "$enable_svg" = "no"; then
>-   enable_svg_fonts=no
>    enable_svg_as_image=no
> fi
> 
>@@ -713,14 +712,6 @@ AC_ARG_ENABLE(filters,
>               [],[enable_filters="yes"])
> AC_MSG_RESULT([$enable_filters])
> 
>-# check whether to enable support for SVG fonts
>-AC_MSG_CHECKING([whether to enable support for SVG fonts])
>-AC_ARG_ENABLE(svg_fonts,
>-              AC_HELP_STRING([--enable-svg-fonts],
>-                             [enable support for SVG fonts (experimental) [default=yes]]),
>-              [],[enable_svg_fonts="yes"])
>-AC_MSG_RESULT([$enable_svg_fonts])
>-
> # check whether to enable SVG As Image support
> AC_MSG_CHECKING([whether to enable SVG as Image support])
> AC_ARG_ENABLE(svg_as_image,
>@@ -730,8 +721,7 @@ AC_ARG_ENABLE(svg_as_image,
> AC_MSG_RESULT([$enable_svg_as_image])
> 
> # check for SVG features, enabling SVG if necessary
>-if test "$enable_svg_fonts" = "yes" || \
>-   test "$enable_svg_as_image" = "yes"; then
>+if test "$enable_svg_as_image" = "yes"; then
>    svg_flags=yes
>    if test "$enable_svg" = "no"; then
>        AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
>@@ -1171,7 +1161,6 @@ AM_CONDITIONAL([ENABLE_MEDIA_STREAM],[test "$enable_media_stream" = "yes"])
> AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
> AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
> AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
>-AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
> AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
> AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
> AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
>@@ -1269,7 +1258,6 @@ Features:
>  Color input support                                      : $enable_input_color
>  Speech input support                                     : $enable_input_speech
>  SVG support                                              : $enable_svg
>- SVG fonts support                                        : $enable_svg_fonts
>  SVG as image support                                     : $enable_svg_as_image
>  WCSS support                                             : $enable_wcss
>  Web Audio support                                        : $enable_web_audio

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 68179: 107525