⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 267497 in webkit


Ignore:
Timestamp:
Sep 23, 2020, 12:50:23 PM (6 years ago)
Author:
Fujii Hironori
Message:

Remove ENABLE_SVG_FONTS macro
​https://bugs.webkit.org/show_bug.cgi?id=216850

Reviewed by Don Olmstead.

.:

No ports have this disabled, so remove it.

  • Source/cmake/OptionsFTW.cmake:
  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/OptionsWin.cmake:
  • Source/cmake/WebKitFeatures.cmake:
  • Source/cmake/tools/vsprops/FeatureDefines.props:
  • Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/WebCore:

  • CMakeLists.txt:
  • css/CSSFontFace.cpp:

(WebCore::CSSFontFace::appendSources):
(WebCore::CSSFontFace::hasSVGFontFaceSource const):

  • css/CSSFontFace.h:
  • css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::CSSFontFaceSource):
(WebCore::CSSFontFaceSource::load):
(WebCore::CSSFontFaceSource::font):
(WebCore::CSSFontFaceSource::isSVGFontFaceSource const):

  • css/CSSFontFaceSource.h:
  • css/CSSFontFaceSrcValue.cpp:

(WebCore::CSSFontFaceSrcValue::isSVGFontTarget const):
(WebCore::CSSFontFaceSrcValue::isSupportedFormat const):

  • css/CSSFontFaceSrcValue.h:
  • inspector/agents/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::inspectorResourceType):

  • loader/LinkLoader.cpp:

(WebCore::createLinkPreloadResourceClient):

  • loader/ResourceLoadInfo.cpp:

(WebCore::ContentExtensions::toResourceType):

  • loader/SubresourceLoader.cpp:

(WebCore::logResourceLoaded):

  • loader/cache/CachedResource.cpp:

(WebCore::CachedResource::defaultPriorityForResourceType):
(WebCore::CachedResource::isCORSSameOrigin const):

  • loader/cache/CachedResource.h:
  • loader/cache/CachedResourceLoader.cpp:

(WebCore::createResource):
(WebCore::CachedResourceLoader::requestFont):
(WebCore::contentTypeFromResourceType):
(WebCore::CachedResourceLoader::checkInsecureContent const):
(WebCore::CachedResourceLoader::allowedByContentSecurityPolicy const):
(WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
(WebCore::destinationForType):

  • loader/cache/CachedSVGFont.cpp:
  • loader/cache/CachedSVGFont.h:
  • loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::getStatistics):

  • rendering/svg/SVGTextLayoutEngineSpacing.cpp:
  • style/StyleResolver.cpp:

(WebCore::Style::Resolver::addCurrentSVGFontFaceRules):

  • 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/SVGDocumentExtensions.cpp:
  • svg/SVGDocumentExtensions.h:
  • svg/SVGElement.cpp:

(WebCore::SVGElement::childShouldCreateRenderer const):

  • 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/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 const):
(WebCore::SVGTSpanElement::rendererIsNeeded):

  • svg/SVGTests.cpp:

(WebCore::supportedSVGFeatures):

  • svg/SVGTextElement.cpp:

(WebCore::SVGTextElement::childShouldCreateRenderer const):

  • svg/SVGTextPositioningElement.cpp:

(WebCore::SVGTextPositioningElement::elementFromRenderer):

  • svg/SVGToOTFFontConversion.cpp:
  • svg/SVGVKernElement.cpp:
  • svg/SVGVKernElement.h:
  • svg/SVGVKernElement.idl:
  • svg/svgtags.in:

Source/WebKit:

  • WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::maximumBufferingTime):

Source/WTF:

  • wtf/PlatformEnable.h:

Tools:

  • Scripts/webkitperl/FeatureList.pm:
Location:
trunk
Files:
85 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r267458 r267497  
     12020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_SVG_FONTS macro
     4        https://bugs.webkit.org/show_bug.cgi?id=216850
     5
     6        Reviewed by Don Olmstead.
     7
     8        No ports have this disabled, so remove it.
     9
     10        * Source/cmake/OptionsFTW.cmake:
     11        * Source/cmake/OptionsMac.cmake:
     12        * Source/cmake/OptionsWin.cmake:
     13        * Source/cmake/WebKitFeatures.cmake:
     14        * Source/cmake/tools/vsprops/FeatureDefines.props:
     15        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
     16
    1172020-09-22  Keith Rollin  <krollin@apple.com>
    218

  • trunk/Source/WTF/ChangeLog

    r267472 r267497  
     12020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_SVG_FONTS macro
     4        https://bugs.webkit.org/show_bug.cgi?id=216850
     5
     6        Reviewed by Don Olmstead.
     7
     8        * wtf/PlatformEnable.h:
     9
    1102020-09-23  Youenn Fablet  <youenn@apple.com>
    211

  • trunk/Source/WTF/wtf/PlatformEnable.h

    r267371 r267497  
    455455#endif
    456456
    457 #if !defined(ENABLE_SVG_FONTS)
    458 #define ENABLE_SVG_FONTS 1
    459 #endif
    460 
    461457#if !defined(ENABLE_TEXT_CARET)
    462458#define ENABLE_TEXT_CARET 1

  • trunk/Source/WebCore/CMakeLists.txt

    r267472 r267497  
    20682068endif ()
    20692069
    2070 # SVG extra defines need to map to a numerical value for correct preprocessing of svgtags.in.
    2071 set(SVG_EXTRA_DEFINES "")
    2072 if (ENABLE_SVG_FONTS)
    2073     list(APPEND SVG_EXTRA_DEFINES "ENABLE_SVG_FONTS=1")
    2074 endif ()
    2075 
    2076 GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_EXTRA_DEFINES}")
     2070GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in)
    20772071list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SVGNames.cpp)
    20782072

  • trunk/Source/WebCore/ChangeLog

    r267495 r267497  
     12020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_SVG_FONTS macro
     4        https://bugs.webkit.org/show_bug.cgi?id=216850
     5
     6        Reviewed by Don Olmstead.
     7
     8        * CMakeLists.txt:
     9        * css/CSSFontFace.cpp:
     10        (WebCore::CSSFontFace::appendSources):
     11        (WebCore::CSSFontFace::hasSVGFontFaceSource const):
     12        * css/CSSFontFace.h:
     13        * css/CSSFontFaceSource.cpp:
     14        (WebCore::CSSFontFaceSource::CSSFontFaceSource):
     15        (WebCore::CSSFontFaceSource::load):
     16        (WebCore::CSSFontFaceSource::font):
     17        (WebCore::CSSFontFaceSource::isSVGFontFaceSource const):
     18        * css/CSSFontFaceSource.h:
     19        * css/CSSFontFaceSrcValue.cpp:
     20        (WebCore::CSSFontFaceSrcValue::isSVGFontTarget const):
     21        (WebCore::CSSFontFaceSrcValue::isSupportedFormat const):
     22        * css/CSSFontFaceSrcValue.h:
     23        * inspector/agents/InspectorPageAgent.cpp:
     24        (WebCore::InspectorPageAgent::inspectorResourceType):
     25        * loader/LinkLoader.cpp:
     26        (WebCore::createLinkPreloadResourceClient):
     27        * loader/ResourceLoadInfo.cpp:
     28        (WebCore::ContentExtensions::toResourceType):
     29        * loader/SubresourceLoader.cpp:
     30        (WebCore::logResourceLoaded):
     31        * loader/cache/CachedResource.cpp:
     32        (WebCore::CachedResource::defaultPriorityForResourceType):
     33        (WebCore::CachedResource::isCORSSameOrigin const):
     34        * loader/cache/CachedResource.h:
     35        * loader/cache/CachedResourceLoader.cpp:
     36        (WebCore::createResource):
     37        (WebCore::CachedResourceLoader::requestFont):
     38        (WebCore::contentTypeFromResourceType):
     39        (WebCore::CachedResourceLoader::checkInsecureContent const):
     40        (WebCore::CachedResourceLoader::allowedByContentSecurityPolicy const):
     41        (WebCore::CachedResourceLoader::shouldUpdateCachedResourceWithCurrentRequest):
     42        (WebCore::destinationForType):
     43        * loader/cache/CachedSVGFont.cpp:
     44        * loader/cache/CachedSVGFont.h:
     45        * loader/cache/MemoryCache.cpp:
     46        (WebCore::MemoryCache::getStatistics):
     47        * rendering/svg/SVGTextLayoutEngineSpacing.cpp:
     48        * style/StyleResolver.cpp:
     49        (WebCore::Style::Resolver::addCurrentSVGFontFaceRules):
     50        * svg/SVGAltGlyphDefElement.cpp:
     51        * svg/SVGAltGlyphDefElement.h:
     52        * svg/SVGAltGlyphDefElement.idl:
     53        * svg/SVGAltGlyphElement.cpp:
     54        * svg/SVGAltGlyphElement.h:
     55        * svg/SVGAltGlyphElement.idl:
     56        * svg/SVGAltGlyphItemElement.cpp:
     57        * svg/SVGAltGlyphItemElement.h:
     58        * svg/SVGAltGlyphItemElement.idl:
     59        * svg/SVGDocumentExtensions.cpp:
     60        * svg/SVGDocumentExtensions.h:
     61        * svg/SVGElement.cpp:
     62        (WebCore::SVGElement::childShouldCreateRenderer const):
     63        * svg/SVGFontElement.cpp:
     64        * svg/SVGFontElement.h:
     65        * svg/SVGFontElement.idl:
     66        * svg/SVGFontFaceElement.cpp:
     67        * svg/SVGFontFaceElement.h:
     68        * svg/SVGFontFaceElement.idl:
     69        * svg/SVGFontFaceFormatElement.cpp:
     70        * svg/SVGFontFaceFormatElement.h:
     71        * svg/SVGFontFaceFormatElement.idl:
     72        * svg/SVGFontFaceNameElement.cpp:
     73        * svg/SVGFontFaceNameElement.h:
     74        * svg/SVGFontFaceNameElement.idl:
     75        * svg/SVGFontFaceSrcElement.cpp:
     76        * svg/SVGFontFaceSrcElement.h:
     77        * svg/SVGFontFaceSrcElement.idl:
     78        * svg/SVGFontFaceUriElement.cpp:
     79        * svg/SVGFontFaceUriElement.h:
     80        * svg/SVGFontFaceUriElement.idl:
     81        * svg/SVGGlyphElement.cpp:
     82        * svg/SVGGlyphElement.h:
     83        * svg/SVGGlyphElement.idl:
     84        * svg/SVGGlyphRefElement.cpp:
     85        * svg/SVGGlyphRefElement.h:
     86        * svg/SVGGlyphRefElement.idl:
     87        * svg/SVGHKernElement.cpp:
     88        * svg/SVGHKernElement.h:
     89        * svg/SVGHKernElement.idl:
     90        * svg/SVGMissingGlyphElement.cpp:
     91        * svg/SVGMissingGlyphElement.h:
     92        * svg/SVGMissingGlyphElement.idl:
     93        * svg/SVGTRefElement.cpp:
     94        (WebCore::SVGTRefElement::rendererIsNeeded):
     95        * svg/SVGTSpanElement.cpp:
     96        (WebCore::SVGTSpanElement::childShouldCreateRenderer const):
     97        (WebCore::SVGTSpanElement::rendererIsNeeded):
     98        * svg/SVGTests.cpp:
     99        (WebCore::supportedSVGFeatures):
     100        * svg/SVGTextElement.cpp:
     101        (WebCore::SVGTextElement::childShouldCreateRenderer const):
     102        * svg/SVGTextPositioningElement.cpp:
     103        (WebCore::SVGTextPositioningElement::elementFromRenderer):
     104        * svg/SVGToOTFFontConversion.cpp:
     105        * svg/SVGVKernElement.cpp:
     106        * svg/SVGVKernElement.h:
     107        * svg/SVGVKernElement.idl:
     108        * svg/svgtags.in:
     109
    11102020-09-23  Tadeu Zagallo  <tzagallo@apple.com>
    2111

  • trunk/Source/WebCore/css/CSSFontFace.cpp

    r257676 r267497  
    7272        bool foundSVGFont = false;
    7373
    74 #if ENABLE(SVG_FONTS)
    7574        foundSVGFont = item.isSVGFontFaceSrc() || item.svgFontFaceElement();
    7675        fontFaceElement = item.svgFontFaceElement();
    77 #endif
    7876        if (!item.isLocal()) {
    7977            const Settings* settings = document ? &document->settings() : nullptr;
    … …  
    706704}
    707705
    708 #if ENABLE(SVG_FONTS)
    709706bool CSSFontFace::hasSVGFontFaceSource() const
    710707{
    … …  
    716713    return false;
    717714}
    718 #endif
    719715
    720716void CSSFontFace::setErrorState()

  • trunk/Source/WebCore/css/CSSFontFace.h

    r257676 r267497  
    161161    void updateStyleIfNeeded();
    162162
    163 #if ENABLE(SVG_FONTS)
    164163    bool hasSVGFontFaceSource() const;
    165 #endif
    166164    void setErrorState();
    167165

  • trunk/Source/WebCore/css/CSSFontFaceSource.cpp

    r252760 r267497  
    3030#include "CSSFontSelector.h"
    3131#include "CachedFont.h"
     32#include "CachedSVGFont.h"
    3233#include "Document.h"
    3334#include "Font.h"
    … …  
    3839#include "ResourceLoadObserver.h"
    3940#include "RuntimeEnabledFeatures.h"
    40 #include "SVGToOTFFontConversion.h"
    41 #include "SharedBuffer.h"
    42 
    43 #if ENABLE(SVG_FONTS)
    44 #include "CachedSVGFont.h"
    45 #include "FontCustomPlatformData.h"
    4641#include "SVGFontElement.h"
    4742#include "SVGFontFaceElement.h"
     43#include "SVGToOTFFontConversion.h"
    4844#include "SVGURIReference.h"
    49 #endif
     45#include "SharedBuffer.h"
    5046
    5147namespace WebCore {
    … …  
    7672    , m_face(owner)
    7773    , m_immediateSource(WTFMove(arrayBufferView))
    78 #if ENABLE(SVG_FONTS)
    7974    , m_svgFontFaceElement(makeWeakPtr(fontFace))
    8075    , m_hasSVGFontFaceElement(m_svgFontFaceElement)
    81 #endif
    82 {
    83 #if !ENABLE(SVG_FONTS)
    84     UNUSED_PARAM(fontFace);
    85 #endif
    86 
     76{
    8777    // This may synchronously call fontLoaded().
    8878    if (m_font)
    … …  
    152142    } else {
    153143        bool success = false;
    154 #if ENABLE(SVG_FONTS)
    155144        if (m_hasSVGFontFaceElement) {
    156145            if (m_svgFontFaceElement && is<SVGFontElement>(m_svgFontFaceElement->parentNode())) {
    … …  
    164153                }
    165154            }
    166         } else
    167 #endif
    168         if (m_immediateSource) {
     155        } else if (m_immediateSource) {
    169156            ASSERT(!m_immediateFontCustomPlatformData);
    170157            bool wrapping;
    … …  
    194181    ASSERT(status() == Status::Success);
    195182
    196 #if ENABLE(SVG_FONTS)
    197183    bool usesInDocumentSVGFont = m_hasSVGFontFaceElement;
    198 #else
    199     bool usesInDocumentSVGFont = false;
    200 #endif
    201184
    202185    if (!m_font && !usesInDocumentSVGFont) {
    … …  
    225208        return nullptr;
    226209
    227 #if ENABLE(SVG_FONTS)
    228210    if (!m_svgFontFaceElement || !is<SVGFontElement>(m_svgFontFaceElement->parentNode()))
    229211        return nullptr;
    … …  
    231213        return nullptr;
    232214    return Font::create(m_inDocumentCustomPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceCapabilities), Font::Origin::Remote);
    233 #endif
    234215
    235216    ASSERT_NOT_REACHED();
    … …  
    237218}
    238219
    239 #if ENABLE(SVG_FONTS)
    240220bool CSSFontFaceSource::isSVGFontFaceSource() const
    241221{
    242222    return m_hasSVGFontFaceElement || is<CachedSVGFont>(m_font.get());
    243223}
    244 #endif
    245 
    246 }
     224
     225}

  • trunk/Source/WebCore/css/CSSFontFaceSource.h

    r254202 r267497  
    7676    bool requiresExternalResource() const { return m_font; }
    7777
    78 #if ENABLE(SVG_FONTS)
    7978    bool isSVGFontFaceSource() const;
    80 #endif
    8179
    8280private:
    … …  
    9593    std::unique_ptr<FontCustomPlatformData> m_immediateFontCustomPlatformData;
    9694
    97 #if ENABLE(SVG_FONTS)
    9895    WeakPtr<SVGFontFaceElement> m_svgFontFaceElement;
    99 #endif
    10096    std::unique_ptr<FontCustomPlatformData> m_inDocumentCustomPlatformData;
    10197
    10298    Status m_status { Status::Pending };
    103 #if ENABLE(SVG_FONTS)
    10499    bool m_hasSVGFontFaceElement;
    105 #endif
    106100};
    107101

  • trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp

    r249013 r267497  
    3838namespace WebCore {
    3939
    40 #if ENABLE(SVG_FONTS)
    4140bool CSSFontFaceSrcValue::isSVGFontFaceSrc() const
    4241{
    … …  
    4847    return isSVGFontFaceSrc() || svgFontFaceElement();
    4948}
    50 #endif
    5149
    5250bool CSSFontFaceSrcValue::isSupportedFormat() const
    … …  
    6159    }
    6260
    63     return FontCustomPlatformData::supportsFormat(m_format)
    64 #if ENABLE(SVG_FONTS)
    65            || isSVGFontFaceSrc()
    66 #endif
    67            ;
     61    return FontCustomPlatformData::supportsFormat(m_format) || isSVGFontFaceSrc();
    6862}
    6963

  • trunk/Source/WebCore/css/CSSFontFaceSrcValue.h

    r238698 r267497  
    5757    bool isSupportedFormat() const;
    5858
    59 #if ENABLE(SVG_FONTS)
    6059    bool isSVGFontFaceSrc() const;
    6160    bool isSVGFontTarget() const;
    … …  
    6362    SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
    6463    void setSVGFontFaceElement(SVGFontFaceElement* element) { m_svgFontFaceElement = element; }
    65 #endif
    6664
    6765    String customCSSText() const;
    … …  
    7977        , m_isLocal(local)
    8078        , m_loadedFromOpaqueSource(loadedFromOpaqueSource)
    81 #if ENABLE(SVG_FONTS)
    8279        , m_svgFontFaceElement(0)
    83 #endif
    8480    {
    8581    }
    … …  
    9288    CachedResourceHandle<CachedFont> m_cachedFont;
    9389
    94 #if ENABLE(SVG_FONTS)
    9590    SVGFontFaceElement* m_svgFontFaceElement;
    96 #endif
    9791};
    9892

  • trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp

    r266885 r267497  
    133133        case CachedResource::Type::ImageResource:
    134134            // Skip images that were not auto loaded (images disabled in the user agent).
    135 #if ENABLE(SVG_FONTS)
    136135        case CachedResource::Type::SVGFontResource:
    137 #endif
    138136        case CachedResource::Type::FontResource:
    139137            // Skip fonts that were referenced in CSS but never used/downloaded.
    … …  
    252250    case CachedResource::Type::ImageResource:
    253251        return InspectorPageAgent::ImageResource;
    254 #if ENABLE(SVG_FONTS)
    255252    case CachedResource::Type::SVGFontResource:
    256 #endif
    257253    case CachedResource::Type::FontResource:
    258254        return InspectorPageAgent::FontResource;

  • trunk/Source/WebCore/loader/LinkLoader.cpp

    r266360 r267497  
    157157    case CachedResource::Type::MainResource:
    158158    case CachedResource::Type::Icon:
    159 #if ENABLE(SVG_FONTS)
    160159    case CachedResource::Type::SVGFontResource:
    161 #endif
    162160    case CachedResource::Type::SVGDocumentResource:
    163161#if ENABLE(XSLT)

  • trunk/Source/WebCore/loader/ResourceLoadInfo.cpp

    r262695 r267497  
    5555
    5656    case CachedResource::Type::FontResource:
    57 #if ENABLE(SVG_FONTS)
    5857    case CachedResource::Type::SVGFontResource:
    59 #endif
    6058        return ResourceType::Font;
    6159

  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r267222 r267497  
    575575        break;
    576576    case CachedResource::Type::FontResource:
    577 #if ENABLE(SVG_FONTS)
    578577    case CachedResource::Type::SVGFontResource:
    579 #endif
    580578        resourceType = DiagnosticLoggingKeys::fontKey();
    581579        break;

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r264698 r267497  
    8282    case Type::Script:
    8383        return ResourceLoadPriority::High;
    84 #if ENABLE(SVG_FONTS)
    8584    case Type::SVGFontResource:
    86 #endif
    8785    case Type::MediaResource:
    8886    case Type::FontResource:
    … …  
    439437    // Following resource types do not use CORS
    440438    ASSERT(type() != Type::FontResource);
    441 #if ENABLE(SVG_FONTS)
    442439    ASSERT(type() != Type::SVGFontResource);
    443 #endif
    444440#if ENABLE(XSLT)
    445441    ASSERT(type() != Type::XSLStyleSheet);

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r262695 r267497  
    7171        Script,
    7272        FontResource,
    73 #if ENABLE(SVG_FONTS)
    7473        SVGFontResource,
    75 #endif
    7674        MediaResource,
    7775        RawResource,

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r267222 r267497  
    123123    case CachedResource::Type::SVGDocumentResource:
    124124        return new CachedSVGDocument(WTFMove(request), sessionID, cookieJar);
    125 #if ENABLE(SVG_FONTS)
    126125    case CachedResource::Type::SVGFontResource:
    127126        return new CachedSVGFont(WTFMove(request), sessionID, cookieJar);
    128 #endif
    129127    case CachedResource::Type::FontResource:
    130128        return new CachedFont(WTFMove(request), sessionID, cookieJar);
    … …  
    214212ResourceErrorOr<CachedResourceHandle<CachedFont>> CachedResourceLoader::requestFont(CachedResourceRequest&& request, bool isSVG)
    215213{
    216 #if ENABLE(SVG_FONTS)
    217214    if (isSVG)
    218215        return castCachedResourceTo<CachedFont>(requestResource(CachedResource::Type::SVGFontResource, WTFMove(request)));
    219 #else
    220     UNUSED_PARAM(isSVG);
    221 #endif
    222216    return castCachedResourceTo<CachedFont>(requestResource(CachedResource::Type::FontResource, WTFMove(request)));
    223217}
    … …  
    341335        return MixedContentChecker::ContentType::Active;
    342336
    343 #if ENABLE(SVG_FONTS)
    344337    case CachedResource::Type::SVGFontResource:
    345338        return MixedContentChecker::ContentType::Active;
    346 #endif
    347339
    348340    case CachedResource::Type::Beacon:
    … …  
    403395    case CachedResource::Type::Icon:
    404396    case CachedResource::Type::ImageResource:
    405 #if ENABLE(SVG_FONTS)
    406397    case CachedResource::Type::SVGFontResource:
    407 #endif
    408398    case CachedResource::Type::FontResource: {
    409399        // These resources can corrupt only the frame's pixels.
    … …  
    456446            return false;
    457447        break;
    458 #if ENABLE(SVG_FONTS)
    459448    case CachedResource::Type::SVGFontResource:
    460 #endif
    461449    case CachedResource::Type::FontResource:
    462450        if (!m_document->contentSecurityPolicy()->allowFontFromSource(url, redirectResponseReceived))
    … …  
    629617        return false;
    630618
    631 #if ENABLE(SVG_FONTS)
    632619    if (resource.type() == CachedResource::Type::SVGFontResource)
    633620        return false;
    634 #endif
    635621
    636622#if ENABLE(XSLT)
    … …  
    753739        return FetchOptions::Destination::Script;
    754740    case CachedResource::Type::FontResource:
    755 #if ENABLE(SVG_FONTS)
    756741    case CachedResource::Type::SVGFontResource:
    757 #endif
    758742        return FetchOptions::Destination::Font;
    759743#if ENABLE(XSLT)

  • trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp

    r252760 r267497  
    2727#include "config.h"
    2828#include "CachedSVGFont.h"
    29 
    30 #if ENABLE(SVG_FONTS)
    3129
    3230#include "FontDescription.h"
    … …  
    134132
    135133}
    136 
    137 #endif

  • trunk/Source/WebCore/loader/cache/CachedSVGFont.h

    r252760 r267497  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(SVG_FONTS)
    2927
    3028#include "CachedFont.h"
    … …  
    5856
    5957SPECIALIZE_TYPE_TRAITS_CACHED_RESOURCE(CachedSVGFont, CachedResource::Type::SVGFontResource)
    60 
    61 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/loader/cache/MemoryCache.cpp

    r254087 r267497  
    644644                break;
    645645#endif
    646 #if ENABLE(SVG_FONTS)
    647646            case CachedResource::Type::SVGFontResource:
    648 #endif
    649647            case CachedResource::Type::FontResource:
    650648                stats.fonts.addResource(*resource);

  • trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp

    r249822 r267497  
    2222
    2323#include "FontCascade.h"
     24#include "SVGFontElement.h"
     25#include "SVGFontFaceElement.h"
    2426#include "SVGLengthContext.h"
    2527#include "SVGRenderStyle.h"
    26 
    27 #if ENABLE(SVG_FONTS)
    28 #include "SVGFontElement.h"
    29 #include "SVGFontFaceElement.h"
    30 #endif
    3128
    3229namespace WebCore {

  • trunk/Source/WebCore/style/StyleResolver.cpp

    r263140 r267497  
    124124void Resolver::addCurrentSVGFontFaceRules()
    125125{
    126 #if ENABLE(SVG_FONTS)
    127126    if (m_document.svgExtensions()) {
    128127        const HashSet<SVGFontFaceElement*>& svgFontFaceElements = m_document.svgExtensions()->svgFontFaceElements();
    … …  
    130129            m_document.fontSelector().addFontFaceRule(svgFontFaceElement->fontFaceRule(), svgFontFaceElement->isInUserAgentShadowTree());
    131130    }
    132 #endif
    133131}
    134132

  • trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp

    r229694 r267497  
    1919
    2020#include "config.h"
    21 
    22 #if ENABLE(SVG_FONTS)
    2321#include "SVGAltGlyphDefElement.h"
    2422
    … …  
    121119
    122120}
    123 
    124 #endif

  • trunk/Source/WebCore/svg/SVGAltGlyphDefElement.h

    r229694 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523#include <wtf/Forward.h>
    … …  
    4139
    4240} // namespace WebCore
    43 
    44 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGAltGlyphDefElement.idl

    r163440 r267497  
    1818 */
    1919
    20 [Conditional=SVG_FONTS] interface SVGAltGlyphDefElement : SVGElement {
     20interface SVGAltGlyphDefElement : SVGElement {
    2121};
    2222

  • trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp

    r246490 r267497  
    2323#include "config.h"
    2424#include "SVGAltGlyphElement.h"
    25 
    26 #if ENABLE(SVG_FONTS)
    2725
    2826#include "RenderInline.h"
    … …  
    9795
    9896}
    99 
    100 #endif

  • trunk/Source/WebCore/svg/SVGAltGlyphElement.h

    r246490 r267497  
    2121
    2222#pragma once
    23 
    24 #if ENABLE(SVG_FONTS)
    2523
    2624#include "SVGTextPositioningElement.h"
    … …  
    5654
    5755} // namespace WebCore
    58 
    59 #endif

  • trunk/Source/WebCore/svg/SVGAltGlyphElement.idl

    r266523 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS,
    28 ] interface SVGAltGlyphElement : SVGTextPositioningElement {
     26interface SVGAltGlyphElement : SVGTextPositioningElement {
    2927    attribute DOMString glyphRef;
    3028    attribute DOMString format;

  • trunk/Source/WebCore/svg/SVGAltGlyphItemElement.cpp

    r229694 r267497  
    2020#include "config.h"
    2121
    22 #if ENABLE(SVG_FONTS)
    2322#include "SVGAltGlyphItemElement.h"
    2423
    … …  
    6766
    6867}
    69 
    70 #endif

  • trunk/Source/WebCore/svg/SVGAltGlyphItemElement.h

    r229694 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523#include <wtf/Forward.h>
    … …  
    4139
    4240} // namespace WebCore
    43 
    44 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGAltGlyphItemElement.idl

    r163440 r267497  
    1818 */
    1919
    20 [Conditional=SVG_FONTS] interface SVGAltGlyphItemElement : SVGElement {
     20interface SVGAltGlyphItemElement : SVGElement {
    2121};
    2222

  • trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp

    r251290 r267497  
    342342}
    343343
    344 #if ENABLE(SVG_FONTS)
    345 
    346344void SVGDocumentExtensions::registerSVGFontFaceElement(SVGFontFaceElement& element)
    347345{
    … …  
    355353}
    356354
    357 #endif
    358 
    359 }
     355}

  • trunk/Source/WebCore/svg/SVGDocumentExtensions.h

    r251290 r267497  
    7171    void rebuildElements();
    7272
    73 #if ENABLE(SVG_FONTS)
    7473    const HashSet<SVGFontFaceElement*>& svgFontFaceElements() const { return m_svgFontFaceElements; }
    7574    void registerSVGFontFaceElement(SVGFontFaceElement&);
    7675    void unregisterSVGFontFaceElement(SVGFontFaceElement&);
    77 #endif
    7876
    7977private:
    8078    Document& m_document;
    8179    HashSet<SVGSVGElement*> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
    82 #if ENABLE(SVG_FONTS)
    8380    HashSet<SVGFontFaceElement*> m_svgFontFaceElements;
    84 #endif
    8581    HashMap<AtomString, RenderSVGResourceContainer*> m_resources;
    8682    HashMap<AtomString, std::unique_ptr<PendingElements>> m_pendingResources; // Resources that are pending.

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r267191 r267497  
    476476
    477477    static const QualifiedName* const invalidTextContent[] {
    478 #if ENABLE(SVG_FONTS)
    479478        &SVGNames::altGlyphTag.get(),
    480 #endif
    481479        &SVGNames::textPathTag.get(),
    482480        &SVGNames::trefTag.get(),

  • trunk/Source/WebCore/svg/SVGFontElement.cpp

    r251318 r267497  
    2222
    2323#include "config.h"
    24 
    25 #if ENABLE(SVG_FONTS)
    2624#include "SVGFontElement.h"
    2725
    … …  
    5351
    5452}
    55 
    56 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontElement.h

    r251318 r267497  
    2222
    2323#pragma once
    24 
    25 #if ENABLE(SVG_FONTS)
    2624
    2725#include "SVGElement.h"
    … …  
    5957
    6058} // namespace WebCore
    61 
    62 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontElement : SVGElement {
     26interface SVGFontElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

    r246490 r267497  
    2222#include "config.h"
    2323
    24 #if ENABLE(SVG_FONTS)
    2524#include "SVGFontFaceElement.h"
    2625
    … …  
    332331
    333332} // namespace WebCore
    334 
    335 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceElement.h

    r246490 r267497  
    2121
    2222#pragma once
    23 
    24 #if ENABLE(SVG_FONTS)
    2523
    2624#include "SVGElement.h"
    … …  
    7169
    7270} // namespace WebCore
    73 
    74 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontFaceElement : SVGElement {
     26interface SVGFontFaceElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGFontFaceFormatElement.cpp

    r229694 r267497  
    1919
    2020#include "config.h"
    21 
    22 #if ENABLE(SVG_FONTS)
    2321#include "SVGFontFaceFormatElement.h"
    2422
    … …  
    6159
    6260}
    63 
    64 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceFormatElement.h

    r229694 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523
    … …  
    3937
    4038} // namespace WebCore
    41 
    42 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceFormatElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontFaceFormatElement : SVGElement {
     26interface SVGFontFaceFormatElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGFontFaceNameElement.cpp

    r229694 r267497  
    1919
    2020#include "config.h"
    21 
    22 #if ENABLE(SVG_FONTS)
    2321#include "SVGFontFaceNameElement.h"
    2422
    … …  
    4846
    4947}
    50 
    51 #endif // ENABLE(SVG_FONTS)
    52 

  • trunk/Source/WebCore/svg/SVGFontFaceNameElement.h

    r229694 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523
    … …  
    4240
    4341} // namespace WebCore
    44 
    45 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceNameElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontFaceNameElement : SVGElement {
     26interface SVGFontFaceNameElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGFontFaceSrcElement.cpp

    r229694 r267497  
    1919
    2020#include "config.h"
    21 
    22 #if ENABLE(SVG_FONTS)
    2321#include "SVGFontFaceSrcElement.h"
    2422
    … …  
    7270
    7371}
    74 
    75 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceSrcElement.h

    r229694 r267497  
    1919
    2020#pragma once
    21 
    22 #if ENABLE(SVG_FONTS)
    2321
    2422#include "SVGElement.h"
    … …  
    4341
    4442} // namespace WebCore
    45 
    46 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceSrcElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontFaceSrcElement : SVGElement {
     26interface SVGFontFaceSrcElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp

    r246490 r267497  
    2020
    2121#include "config.h"
    22 
    23 #if ENABLE(SVG_FONTS)
    2422#include "SVGFontFaceUriElement.h"
    2523
    … …  
    120118
    121119}
    122 
    123 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceUriElement.h

    r246490 r267497  
    1919
    2020#pragma once
    21 
    22 #if ENABLE(SVG_FONTS)
    2321
    2422#include "CachedFontClient.h"
    … …  
    5351
    5452} // namespace WebCore
    55 
    56 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGFontFaceUriElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGFontFaceUriElement : SVGElement {
     26interface SVGFontFaceUriElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGGlyphElement.cpp

    r229694 r267497  
    2222#include "config.h"
    2323
    24 #if ENABLE(SVG_FONTS)
    2524#include "SVGGlyphElement.h"
    2625
    … …  
    4746
    4847}
    49 
    50 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGGlyphElement.h

    r229694 r267497  
    2222#pragma once
    2323
    24 #if ENABLE(SVG_FONTS)
    25 
    2624#include "SVGElement.h"
    2725
    … …  
    4341
    4442} // namespace WebCore
    45 
    46 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGGlyphElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGGlyphElement : SVGElement {
     26interface SVGGlyphElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp

    r263334 r267497  
    2020
    2121#include "config.h"
    22 
    23 #if ENABLE(SVG_FONTS)
    2422#include "SVGGlyphRefElement.h"
    2523
    … …  
    10098
    10199}
    102 
    103 #endif

  • trunk/Source/WebCore/svg/SVGGlyphRefElement.h

    r246490 r267497  
    2020
    2121#pragma once
    22 
    23 #if ENABLE(SVG_FONTS)
    2422
    2523#include "SVGElement.h"
    … …  
    6159
    6260}
    63 
    64 #endif

  • trunk/Source/WebCore/svg/SVGGlyphRefElement.idl

    r266523 r267497  
    1818 */
    1919
    20 [
    21     Conditional=SVG_FONTS
    22 ] interface SVGGlyphRefElement : SVGElement {
     20interface SVGGlyphRefElement : SVGElement {
    2321    [Reflect=glyphRef] attribute DOMString glyphRef;
    2422    [Reflect] attribute DOMString format;

  • trunk/Source/WebCore/svg/SVGHKernElement.cpp

    r263334 r267497  
    2121
    2222#include "config.h"
    23 
    24 #if ENABLE(SVG_FONTS)
    2523#include "SVGHKernElement.h"
    2624
    … …  
    8987
    9088}
    91 
    92 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGHKernElement.h

    r263334 r267497  
    2222#pragma once
    2323
    24 #if ENABLE(SVG_FONTS)
    25 
    2624#include "SVGFontElement.h"
    2725
    … …  
    4240
    4341} // namespace WebCore
    44 
    45 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGHKernElement.idl

    r163440 r267497  
    1818 */
    1919
    20 [
    21     Conditional=SVG_FONTS
    22 ] interface SVGHKernElement : SVGElement {
     20interface SVGHKernElement : SVGElement {
    2321};
    2422

  • trunk/Source/WebCore/svg/SVGMissingGlyphElement.cpp

    r229694 r267497  
    2020#include "config.h"
    2121
    22 #if ENABLE(SVG_FONTS)
    2322#include "SVGMissingGlyphElement.h"
    2423#include "SVGNames.h"
    … …  
    4140
    4241}
    43 
    44 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGMissingGlyphElement.h

    r229694 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523#include "SVGNames.h"
    … …  
    3937
    4038} // namespace WebCore
    41 
    42 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGMissingGlyphElement.idl

    r163440 r267497  
    2424 */
    2525
    26 [
    27     Conditional=SVG_FONTS
    28 ] interface SVGMissingGlyphElement : SVGElement {
     26interface SVGMissingGlyphElement : SVGElement {
    2927};
    3028

  • trunk/Source/WebCore/svg/SVGTRefElement.cpp

    r267449 r267497  
    205205    if (parentNode()
    206206        && (parentNode()->hasTagName(SVGNames::aTag)
    207 #if ENABLE(SVG_FONTS)
    208207            || parentNode()->hasTagName(SVGNames::altGlyphTag)
    209 #endif
    210208            || parentNode()->hasTagName(SVGNames::textTag)
    211209            || parentNode()->hasTagName(SVGNames::textPathTag)

  • trunk/Source/WebCore/svg/SVGTSpanElement.cpp

    r229694 r267497  
    5151    if (child.isTextNode()
    5252        || child.hasTagName(SVGNames::aTag)
    53 #if ENABLE(SVG_FONTS)
    5453        || child.hasTagName(SVGNames::altGlyphTag)
    55 #endif
    5654        || child.hasTagName(SVGNames::trefTag)
    5755        || child.hasTagName(SVGNames::tspanTag))
    … …  
    6563    if (parentNode()
    6664        && (parentNode()->hasTagName(SVGNames::aTag)
    67 #if ENABLE(SVG_FONTS)
    6865            || parentNode()->hasTagName(SVGNames::altGlyphTag)
    69 #endif
    7066            || parentNode()->hasTagName(SVGNames::textTag)
    7167            || parentNode()->hasTagName(SVGNames::textPathTag)

  • trunk/Source/WebCore/svg/SVGTests.cpp

    r246490 r267497  
    4343    static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> features = [] {
    4444        static const char* const features10[] = {
    45 #if ENABLE(SVG_FONTS)
    4645            "dom",
    4746            "dom.svg",
    … …  
    4948            "svg",
    5049            "svg.static",
    51 #endif
    5250        };
    5351        static const char* const features11[] = {
    … …  
    8886            "viewportattribute",
    8987            "xlinkattribute",
    90 #if ENABLE(SVG_FONTS)
    9188            "basicfont",
    9289            "font",
    … …  
    9592            "svgdom",
    9693            "svgdom-static",
    97 #endif
    9894        };
    9995        HashSet<String, ASCIICaseInsensitiveHash> set;

  • trunk/Source/WebCore/svg/SVGTextElement.cpp

    r243730 r267497  
    7777    if (child.isTextNode()
    7878        || child.hasTagName(SVGNames::aTag)
    79 #if ENABLE(SVG_FONTS)
    8079        || child.hasTagName(SVGNames::altGlyphTag)
    81 #endif
    8280        || child.hasTagName(SVGNames::textPathTag)
    8381        || child.hasTagName(SVGNames::trefTag)

  • trunk/Source/WebCore/svg/SVGTextPositioningElement.cpp

    r246490 r267497  
    125125    if (!is<SVGTextElement>(element)
    126126        && !is<SVGTSpanElement>(element)
    127 #if ENABLE(SVG_FONTS)
    128127        && !is<SVGAltGlyphElement>(element)
    129 #endif
    130128        && !is<SVGTRefElement>(element))
    131129        return nullptr;

  • trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp

    r263334 r267497  
    2626#include "config.h"
    2727#include "SVGToOTFFontConversion.h"
    28 
    29 #if ENABLE(SVG_FONTS)
    3028
    3129#include "CSSStyleDeclaration.h"
    … …  
    15761574
    15771575}
    1578 
    1579 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGVKernElement.cpp

    r263334 r267497  
    1919
    2020#include "config.h"
    21 
    22 #if ENABLE(SVG_FONTS)
    2321#include "SVGVKernElement.h"
    2422
    … …  
    8886
    8987}
    90 
    91 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGVKernElement.h

    r263334 r267497  
    2020#pragma once
    2121
    22 #if ENABLE(SVG_FONTS)
    23 
    2422#include "SVGElement.h"
    2523#include "SVGFontElement.h"
    … …  
    4139
    4240} // namespace WebCore
    43 
    44 #endif // ENABLE(SVG_FONTS)

  • trunk/Source/WebCore/svg/SVGVKernElement.idl

    r163440 r267497  
    1818 */
    1919
    20 [
    21     Conditional=SVG_FONTS
    22 ] interface SVGVKernElement : SVGElement {
     20interface SVGVKernElement : SVGElement {
    2321};
    2422

  • trunk/Source/WebCore/svg/svgtags.in

    r179980 r267497  
    55
    66a
    7 #if ENABLE_SVG_FONTS
    87altGlyph
    98altGlyphDef
    109altGlyphItem
    11 #endif
    1210animate
    1311animateColor
    … …  
    5048feTurbulence
    5149filter
    52 #if ENABLE_SVG_FONTS
    5350font
    5451font_face
    … …  
    5754font_face_src
    5855font_face_uri
    59 #endif
    6056foreignObject
    6157g
    62 #if ENABLE_SVG_FONTS
    6358glyph
    6459glyphRef
    6560hkern interfaceName=SVGHKernElement
    66 #endif
    6761image
    6862line
    … …  
    7165mask
    7266metadata
    73 #if ENABLE_SVG_FONTS
    7467missing_glyph
    75 #endif
    7668mpath interfaceName=SVGMPathElement
    7769path
    … …  
    9486use
    9587view
    96 #if ENABLE_SVG_FONTS
    9788vkern interfaceName=SVGVKernElement
    98 #endif

  • trunk/Source/WebKit/ChangeLog

    r267496 r267497  
     12020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_SVG_FONTS macro
     4        https://bugs.webkit.org/show_bug.cgi?id=216850
     5
     6        Reviewed by Don Olmstead.
     7
     8        * WebProcess/Network/WebLoaderStrategy.cpp:
     9        (WebKit::maximumBufferingTime):
     10
    1112020-09-23  Per Arne Vollan  <pvollan@apple.com>
    212

  • trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

    r267311 r267497  
    135135    case CachedResource::Type::CSSStyleSheet:
    136136    case CachedResource::Type::Script:
    137 #if ENABLE(SVG_FONTS)
    138137    case CachedResource::Type::SVGFontResource:
    139 #endif
    140138    case CachedResource::Type::FontResource:
    141139#if ENABLE(APPLICATION_MANIFEST)

  • trunk/Source/cmake/OptionsFTW.cmake

    r267166 r267497  
    100100WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PRIVATE OFF)
    101101WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PRIVATE OFF)
    102 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
    103102WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
    104103WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER PRIVATE OFF)

  • trunk/Source/cmake/OptionsMac.cmake

    r267166 r267497  
    8484WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
    8585WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
    86 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
    8786WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
    8887WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE ON)

  • trunk/Source/cmake/OptionsWin.cmake

    r267166 r267497  
    5454WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
    5555WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PUBLIC OFF)
    56 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PUBLIC ON)
    5756WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
    5857WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r267166 r267497  
    206206    WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support" PRIVATE OFF)
    207207    WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" PRIVATE OFF)
    208     WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG Fonts support" PRIVATE ON)
    209208    WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" PRIVATE OFF)
    210209    WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle automatic text size adjustment support" PRIVATE OFF)

  • trunk/Source/cmake/tools/vsprops/FeatureDefines.props

    r267166 r267497  
    5656    <ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
    5757    <ENABLE_SVG_DOM_OBJC_BINDINGS />
    58     <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
    5958    <ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
    6059    <ENABLE_WEB_AUDIO />
    … …  
    7170  <ItemDefinitionGroup>
    7271    <ClCompile>
    73       <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     72      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7473    </ClCompile>
    7574  </ItemDefinitionGroup>
    … …  
    287286      <EnvironmentVariable>true</EnvironmentVariable>
    288287    </BuildMacro>
    289     <BuildMacro Include="ENABLE_SVG_FONTS">
    290       <Value>$(ENABLE_SVG_FONTS)</Value>
    291       <EnvironmentVariable>true</EnvironmentVariable>
    292     </BuildMacro>
    293288    <BuildMacro Include="ENABLE_VIDEO">
    294289      <Value>$(ENABLE_VIDEO)</Value>

  • trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props

    r267166 r267497  
    5656    <ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
    5757    <ENABLE_SVG_DOM_OBJC_BINDINGS />
    58     <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
    5958    <ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
    6059    <ENABLE_WEB_AUDIO />
    … …  
    7170  <ItemDefinitionGroup>
    7271    <ClCompile>
    73       <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     72      <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_OVERFLOW_SCROLLING_TOUCH);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DARK_MODE_CSS);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_QUOTA);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_VIDEO);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBXR);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7473    </ClCompile>
    7574  </ItemDefinitionGroup>
    … …  
    287286      <EnvironmentVariable>true</EnvironmentVariable>
    288287    </BuildMacro>
    289     <BuildMacro Include="ENABLE_SVG_FONTS">
    290       <Value>$(ENABLE_SVG_FONTS)</Value>
    291       <EnvironmentVariable>true</EnvironmentVariable>
    292     </BuildMacro>
    293     <BuildMacro Include="ENABLE_VIDEO">
    294       <Value>$(ENABLE_VIDEO)</Value>
    295       <EnvironmentVariable>true</EnvironmentVariable>
    296     </BuildMacro>
    297288    <BuildMacro Include="ENABLE_WEB_AUDIO">
    298289      <Value>$(ENABLE_WEB_AUDIO)</Value>

  • trunk/Tools/ChangeLog

    r267493 r267497  
     12020-09-23  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_SVG_FONTS macro
     4        https://bugs.webkit.org/show_bug.cgi?id=216850
     5
     6        Reviewed by Don Olmstead.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9
    1102020-09-23  Aakash Jain  <aakash_jain@apple.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r267166 r267497  
    511511      define => "ENABLE_SPELLCHECK", value => \$spellcheckSupport },
    512512
    513     { option => "svg-fonts", desc => "Toggle SVG Fonts support",
    514       define => "ENABLE_SVG_FONTS", value => \$svgFontsSupport },
    515 
    516513    { option => "telephone-number-detection", desc => "Toggle telephone number detection support",
    517514      define => "ENABLE_TELEPHONE_NUMBER_DETECTION", value => \$telephoneNumberDetectionSupport },
Note: See TracChangeset for help on using the changeset viewer.