Diff
Modified: trunk/ChangeLog (267496 => 267497)
--- trunk/ChangeLog 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/ChangeLog 2020-09-23 19:50:23 UTC (rev 267497)
@@ -1,3 +1,19 @@
+2020-09-23 Fujii Hironori <[email protected]>
+
+ 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:
+
2020-09-22 Keith Rollin <[email protected]>
Unify debug and release target aliases
Modified: trunk/Source/WTF/ChangeLog (267496 => 267497)
--- trunk/Source/WTF/ChangeLog 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WTF/ChangeLog 2020-09-23 19:50:23 UTC (rev 267497)
@@ -1,3 +1,12 @@
+2020-09-23 Fujii Hironori <[email protected]>
+
+ Remove ENABLE_SVG_FONTS macro
+ https://bugs.webkit.org/show_bug.cgi?id=216850
+
+ Reviewed by Don Olmstead.
+
+ * wtf/PlatformEnable.h:
+
2020-09-23 Youenn Fablet <[email protected]>
Add support for HTMLMediaElement.setSinkId
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (267496 => 267497)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -454,10 +454,6 @@
#define ENABLE_SPELLCHECK 0
#endif
-#if !defined(ENABLE_SVG_FONTS)
-#define ENABLE_SVG_FONTS 1
-#endif
-
#if !defined(ENABLE_TEXT_CARET)
#define ENABLE_TEXT_CARET 1
#endif
Modified: trunk/Source/WebCore/CMakeLists.txt (267496 => 267497)
--- trunk/Source/WebCore/CMakeLists.txt 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-09-23 19:50:23 UTC (rev 267497)
@@ -2067,13 +2067,7 @@
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/MathMLElementFactory.cpp)
endif ()
-# SVG extra defines need to map to a numerical value for correct preprocessing of svgtags.in.
-set(SVG_EXTRA_DEFINES "")
-if (ENABLE_SVG_FONTS)
- list(APPEND SVG_EXTRA_DEFINES "ENABLE_SVG_FONTS=1")
-endif ()
-
-GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in "${SVG_EXTRA_DEFINES}")
+GENERATE_DOM_NAMES(SVG ${WEBCORE_DIR}/svg/svgattrs.in ${WEBCORE_DIR}/svg/svgtags.in)
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SVGNames.cpp)
list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/SVGElementFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp)
Modified: trunk/Source/WebCore/ChangeLog (267496 => 267497)
--- trunk/Source/WebCore/ChangeLog 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/ChangeLog 2020-09-23 19:50:23 UTC (rev 267497)
@@ -1,3 +1,112 @@
+2020-09-23 Fujii Hironori <[email protected]>
+
+ Remove ENABLE_SVG_FONTS macro
+ https://bugs.webkit.org/show_bug.cgi?id=216850
+
+ Reviewed by Don Olmstead.
+
+ * 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:
+
2020-09-23 Tadeu Zagallo <[email protected]>
Missing scope release in JSDOMBuiltinConstructorBase
Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFace.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -71,10 +71,8 @@
SVGFontFaceElement* fontFaceElement = nullptr;
bool foundSVGFont = false;
-#if ENABLE(SVG_FONTS)
foundSVGFont = item.isSVGFontFaceSrc() || item.svgFontFaceElement();
fontFaceElement = item.svgFontFaceElement();
-#endif
if (!item.isLocal()) {
const Settings* settings = document ? &document->settings() : nullptr;
bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
@@ -705,7 +703,6 @@
m_fontSelector->document()->updateStyleIfNeeded();
}
-#if ENABLE(SVG_FONTS)
bool CSSFontFace::hasSVGFontFaceSource() const
{
size_t size = m_sources.size();
@@ -715,7 +712,6 @@
}
return false;
}
-#endif
void CSSFontFace::setErrorState()
{
Modified: trunk/Source/WebCore/css/CSSFontFace.h (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFace.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -160,9 +160,7 @@
void updateStyleIfNeeded();
-#if ENABLE(SVG_FONTS)
bool hasSVGFontFaceSource() const;
-#endif
void setErrorState();
Document* document() const;
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -29,6 +29,7 @@
#include "CSSFontFace.h"
#include "CSSFontSelector.h"
#include "CachedFont.h"
+#include "CachedSVGFont.h"
#include "Document.h"
#include "Font.h"
#include "FontCache.h"
@@ -37,16 +38,11 @@
#include "FontDescription.h"
#include "ResourceLoadObserver.h"
#include "RuntimeEnabledFeatures.h"
-#include "SVGToOTFFontConversion.h"
-#include "SharedBuffer.h"
-
-#if ENABLE(SVG_FONTS)
-#include "CachedSVGFont.h"
-#include "FontCustomPlatformData.h"
#include "SVGFontElement.h"
#include "SVGFontFaceElement.h"
+#include "SVGToOTFFontConversion.h"
#include "SVGURIReference.h"
-#endif
+#include "SharedBuffer.h"
namespace WebCore {
@@ -75,15 +71,9 @@
, m_font(font)
, m_face(owner)
, m_immediateSource(WTFMove(arrayBufferView))
-#if ENABLE(SVG_FONTS)
, m_svgFontFaceElement(makeWeakPtr(fontFace))
, m_hasSVGFontFaceElement(m_svgFontFaceElement)
-#endif
{
-#if !ENABLE(SVG_FONTS)
- UNUSED_PARAM(fontFace);
-#endif
-
// This may synchronously call fontLoaded().
if (m_font)
m_font->addClient(*this);
@@ -151,7 +141,6 @@
fontSelector->beginLoadingFontSoon(*m_font);
} else {
bool success = false;
-#if ENABLE(SVG_FONTS)
if (m_hasSVGFontFaceElement) {
if (m_svgFontFaceElement && is<SVGFontElement>(m_svgFontFaceElement->parentNode())) {
ASSERT(!m_inDocumentCustomPlatformData);
@@ -163,9 +152,7 @@
success = static_cast<bool>(m_inDocumentCustomPlatformData);
}
}
- } else
-#endif
- if (m_immediateSource) {
+ } else if (m_immediateSource) {
ASSERT(!m_immediateFontCustomPlatformData);
bool wrapping;
auto buffer = SharedBuffer::create(static_cast<const char*>(m_immediateSource->baseAddress()), m_immediateSource->byteLength());
@@ -193,11 +180,7 @@
{
ASSERT(status() == Status::Success);
-#if ENABLE(SVG_FONTS)
bool usesInDocumentSVGFont = m_hasSVGFontFaceElement;
-#else
- bool usesInDocumentSVGFont = false;
-#endif
if (!m_font && !usesInDocumentSVGFont) {
if (m_immediateSource) {
@@ -224,23 +207,19 @@
if (!usesInDocumentSVGFont)
return nullptr;
-#if ENABLE(SVG_FONTS)
if (!m_svgFontFaceElement || !is<SVGFontElement>(m_svgFontFaceElement->parentNode()))
return nullptr;
if (!m_inDocumentCustomPlatformData)
return nullptr;
return Font::create(m_inDocumentCustomPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceCapabilities), Font::Origin::Remote);
-#endif
ASSERT_NOT_REACHED();
return nullptr;
}
-#if ENABLE(SVG_FONTS)
bool CSSFontFaceSource::isSVGFontFaceSource() const
{
return m_hasSVGFontFaceElement || is<CachedSVGFont>(m_font.get());
}
-#endif
}
Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFaceSource.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -75,9 +75,7 @@
CachedFont* cachedFont() const { return m_font.get(); }
bool requiresExternalResource() const { return m_font; }
-#if ENABLE(SVG_FONTS)
bool isSVGFontFaceSource() const;
-#endif
private:
bool shouldIgnoreFontLoadCompletions() const;
@@ -94,15 +92,11 @@
RefPtr<JSC::ArrayBufferView> m_immediateSource;
std::unique_ptr<FontCustomPlatformData> m_immediateFontCustomPlatformData;
-#if ENABLE(SVG_FONTS)
WeakPtr<SVGFontFaceElement> m_svgFontFaceElement;
-#endif
std::unique_ptr<FontCustomPlatformData> m_inDocumentCustomPlatformData;
Status m_status { Status::Pending };
-#if ENABLE(SVG_FONTS)
bool m_hasSVGFontFaceElement;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -37,7 +37,6 @@
namespace WebCore {
-#if ENABLE(SVG_FONTS)
bool CSSFontFaceSrcValue::isSVGFontFaceSrc() const
{
return equalLettersIgnoringASCIICase(m_format, "svg");
@@ -47,7 +46,6 @@
{
return isSVGFontFaceSrc() || svgFontFaceElement();
}
-#endif
bool CSSFontFaceSrcValue::isSupportedFormat() const
{
@@ -60,11 +58,7 @@
return true;
}
- return FontCustomPlatformData::supportsFormat(m_format)
-#if ENABLE(SVG_FONTS)
- || isSVGFontFaceSrc()
-#endif
- ;
+ return FontCustomPlatformData::supportsFormat(m_format) || isSVGFontFaceSrc();
}
String CSSFontFaceSrcValue::customCSSText() const
Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.h (267496 => 267497)
--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -56,13 +56,11 @@
bool isSupportedFormat() const;
-#if ENABLE(SVG_FONTS)
bool isSVGFontFaceSrc() const;
bool isSVGFontTarget() const;
SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
void setSVGFontFaceElement(SVGFontFaceElement* element) { m_svgFontFaceElement = element; }
-#endif
String customCSSText() const;
@@ -78,9 +76,7 @@
, m_resource(resource)
, m_isLocal(local)
, m_loadedFromOpaqueSource(loadedFromOpaqueSource)
-#if ENABLE(SVG_FONTS)
, m_svgFontFaceElement(0)
-#endif
{
}
@@ -91,9 +87,7 @@
CachedResourceHandle<CachedFont> m_cachedFont;
-#if ENABLE(SVG_FONTS)
SVGFontFaceElement* m_svgFontFaceElement;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp (267496 => 267497)
--- trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -132,9 +132,7 @@
switch (cachedResource->type()) {
case CachedResource::Type::ImageResource:
// Skip images that were not auto loaded (images disabled in the user agent).
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource:
// Skip fonts that were referenced in CSS but never used/downloaded.
if (cachedResource->stillNeedsLoad())
@@ -251,9 +249,7 @@
switch (type) {
case CachedResource::Type::ImageResource:
return InspectorPageAgent::ImageResource;
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource:
return InspectorPageAgent::FontResource;
#if ENABLE(XSLT)
Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/LinkLoader.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -156,9 +156,7 @@
return makeUnique<LinkPreloadRawResourceClient>(loader, downcast<CachedRawResource>(resource));
case CachedResource::Type::MainResource:
case CachedResource::Type::Icon:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::SVGDocumentResource:
#if ENABLE(XSLT)
case CachedResource::Type::XSLStyleSheet:
Modified: trunk/Source/WebCore/loader/ResourceLoadInfo.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/ResourceLoadInfo.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -54,9 +54,7 @@
return ResourceType::Script;
case CachedResource::Type::FontResource:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
return ResourceType::Font;
case CachedResource::Type::MediaResource:
Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -574,9 +574,7 @@
resourceType = DiagnosticLoggingKeys::scriptKey();
break;
case CachedResource::Type::FontResource:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
resourceType = DiagnosticLoggingKeys::fontKey();
break;
case CachedResource::Type::Beacon:
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -81,9 +81,7 @@
case Type::CSSStyleSheet:
case Type::Script:
return ResourceLoadPriority::High;
-#if ENABLE(SVG_FONTS)
case Type::SVGFontResource:
-#endif
case Type::MediaResource:
case Type::FontResource:
case Type::RawResource:
@@ -438,9 +436,7 @@
{
// Following resource types do not use CORS
ASSERT(type() != Type::FontResource);
-#if ENABLE(SVG_FONTS)
ASSERT(type() != Type::SVGFontResource);
-#endif
#if ENABLE(XSLT)
ASSERT(type() != Type::XSLStyleSheet);
#endif
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -70,9 +70,7 @@
CSSStyleSheet,
Script,
FontResource,
-#if ENABLE(SVG_FONTS)
SVGFontResource,
-#endif
MediaResource,
RawResource,
Icon,
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -122,10 +122,8 @@
return new CachedScript(WTFMove(request), sessionID, cookieJar);
case CachedResource::Type::SVGDocumentResource:
return new CachedSVGDocument(WTFMove(request), sessionID, cookieJar);
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
return new CachedSVGFont(WTFMove(request), sessionID, cookieJar);
-#endif
case CachedResource::Type::FontResource:
return new CachedFont(WTFMove(request), sessionID, cookieJar);
case CachedResource::Type::Beacon:
@@ -213,12 +211,8 @@
ResourceErrorOr<CachedResourceHandle<CachedFont>> CachedResourceLoader::requestFont(CachedResourceRequest&& request, bool isSVG)
{
-#if ENABLE(SVG_FONTS)
if (isSVG)
return castCachedResourceTo<CachedFont>(requestResource(CachedResource::Type::SVGFontResource, WTFMove(request)));
-#else
- UNUSED_PARAM(isSVG);
-#endif
return castCachedResourceTo<CachedFont>(requestResource(CachedResource::Type::FontResource, WTFMove(request)));
}
@@ -340,10 +334,8 @@
case CachedResource::Type::FontResource:
return MixedContentChecker::ContentType::Active;
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
return MixedContentChecker::ContentType::Active;
-#endif
case CachedResource::Type::Beacon:
case CachedResource::Type::Ping:
@@ -402,9 +394,7 @@
case CachedResource::Type::RawResource:
case CachedResource::Type::Icon:
case CachedResource::Type::ImageResource:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource: {
// These resources can corrupt only the frame's pixels.
if (Frame* frame = this->frame()) {
@@ -455,9 +445,7 @@
if (!m_document->contentSecurityPolicy()->allowImageFromSource(url, redirectResponseReceived))
return false;
break;
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource:
if (!m_document->contentSecurityPolicy()->allowFontFromSource(url, redirectResponseReceived))
return false;
@@ -628,10 +616,8 @@
if (resource.type() == CachedResource::Type::FontResource)
return false;
-#if ENABLE(SVG_FONTS)
if (resource.type() == CachedResource::Type::SVGFontResource)
return false;
-#endif
#if ENABLE(XSLT)
// Load is same-origin, we do not check for CORS.
@@ -752,9 +738,7 @@
case CachedResource::Type::Script:
return FetchOptions::Destination::Script;
case CachedResource::Type::FontResource:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
return FetchOptions::Destination::Font;
#if ENABLE(XSLT)
case CachedResource::Type::XSLStyleSheet:
Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -27,8 +27,6 @@
#include "config.h"
#include "CachedSVGFont.h"
-#if ENABLE(SVG_FONTS)
-
#include "FontDescription.h"
#include "FontPlatformData.h"
#include "SVGDocument.h"
@@ -133,5 +131,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.h (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -25,8 +25,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "CachedFont.h"
namespace WebCore {
@@ -57,5 +55,3 @@
} // namespace WebCore
SPECIALIZE_TYPE_TRAITS_CACHED_RESOURCE(CachedSVGFont, CachedResource::Type::SVGFontResource)
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (267496 => 267497)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -643,9 +643,7 @@
stats.xslStyleSheets.addResource(*resource);
break;
#endif
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource:
stats.fonts.addResource(*resource);
break;
Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp (267496 => 267497)
--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,14 +21,11 @@
#include "SVGTextLayoutEngineSpacing.h"
#include "FontCascade.h"
+#include "SVGFontElement.h"
+#include "SVGFontFaceElement.h"
#include "SVGLengthContext.h"
#include "SVGRenderStyle.h"
-#if ENABLE(SVG_FONTS)
-#include "SVGFontElement.h"
-#include "SVGFontFaceElement.h"
-#endif
-
namespace WebCore {
SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const FontCascade& font)
Modified: trunk/Source/WebCore/style/StyleResolver.cpp (267496 => 267497)
--- trunk/Source/WebCore/style/StyleResolver.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/style/StyleResolver.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -123,13 +123,11 @@
void Resolver::addCurrentSVGFontFaceRules()
{
-#if ENABLE(SVG_FONTS)
if (m_document.svgExtensions()) {
const HashSet<SVGFontFaceElement*>& svgFontFaceElements = m_document.svgExtensions()->svgFontFaceElements();
for (auto* svgFontFaceElement : svgFontFaceElements)
m_document.fontSelector().addFontFaceRule(svgFontFaceElement->fontFaceRule(), svgFontFaceElement->isInUserAgentShadowTree());
}
-#endif
}
void Resolver::appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>& styleSheets)
Modified: trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphDefElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -18,8 +18,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGAltGlyphDefElement.h"
#include "ElementIterator.h"
@@ -120,5 +118,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGAltGlyphDefElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphDefElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphDefElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include <wtf/Forward.h>
@@ -40,5 +38,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGAltGlyphDefElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphDefElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphDefElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -17,6 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-[Conditional=SVG_FONTS] interface SVGAltGlyphDefElement : SVGElement {
+interface SVGAltGlyphDefElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
#include "config.h"
#include "SVGAltGlyphElement.h"
-#if ENABLE(SVG_FONTS)
-
#include "RenderInline.h"
#include "RenderSVGTSpan.h"
#include "SVGAltGlyphDefElement.h"
@@ -96,5 +94,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGAltGlyphElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,8 +21,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGTextPositioningElement.h"
#include "SVGURIReference.h"
@@ -55,5 +53,3 @@
};
} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGAltGlyphElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,9 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS,
-] interface SVGAltGlyphElement : SVGTextPositioningElement {
+interface SVGAltGlyphElement : SVGTextPositioningElement {
attribute DOMString glyphRef;
attribute DOMString format;
};
Modified: trunk/Source/WebCore/svg/SVGAltGlyphItemElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphItemElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphItemElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,7 +19,6 @@
#include "config.h"
-#if ENABLE(SVG_FONTS)
#include "SVGAltGlyphItemElement.h"
#include "ElementIterator.h"
@@ -66,5 +65,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGAltGlyphItemElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphItemElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphItemElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include <wtf/Forward.h>
@@ -40,5 +38,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGAltGlyphItemElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGAltGlyphItemElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGAltGlyphItemElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -17,6 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-[Conditional=SVG_FONTS] interface SVGAltGlyphItemElement : SVGElement {
+interface SVGAltGlyphItemElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -341,8 +341,6 @@
m_rebuildElements.removeFirst(&referencedElement);
}
-#if ENABLE(SVG_FONTS)
-
void SVGDocumentExtensions::registerSVGFontFaceElement(SVGFontFaceElement& element)
{
m_svgFontFaceElements.add(&element);
@@ -354,6 +352,4 @@
m_svgFontFaceElements.remove(&element);
}
-#endif
-
}
Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -70,18 +70,14 @@
void clearTargetDependencies(SVGElement&);
void rebuildElements();
-#if ENABLE(SVG_FONTS)
const HashSet<SVGFontFaceElement*>& svgFontFaceElements() const { return m_svgFontFaceElements; }
void registerSVGFontFaceElement(SVGFontFaceElement&);
void unregisterSVGFontFaceElement(SVGFontFaceElement&);
-#endif
private:
Document& m_document;
HashSet<SVGSVGElement*> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
-#if ENABLE(SVG_FONTS)
HashSet<SVGFontFaceElement*> m_svgFontFaceElements;
-#endif
HashMap<AtomString, RenderSVGResourceContainer*> m_resources;
HashMap<AtomString, std::unique_ptr<PendingElements>> m_pendingResources; // Resources that are pending.
HashMap<AtomString, std::unique_ptr<PendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
Modified: trunk/Source/WebCore/svg/SVGElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -475,9 +475,7 @@
auto& svgChild = downcast<SVGElement>(child);
static const QualifiedName* const invalidTextContent[] {
-#if ENABLE(SVG_FONTS)
&SVGNames::altGlyphTag.get(),
-#endif
&SVGNames::textPathTag.get(),
&SVGNames::trefTag.get(),
&SVGNames::tspanTag.get(),
Modified: trunk/Source/WebCore/svg/SVGFontElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,8 +21,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGFontElement.h"
#include "Document.h"
@@ -52,5 +50,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -22,8 +22,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include "SVGParserUtilities.h"
@@ -58,5 +56,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontElement : SVGElement {
+interface SVGFontElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGFontFaceElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,7 +21,6 @@
#include "config.h"
-#if ENABLE(SVG_FONTS)
#include "SVGFontFaceElement.h"
#include "CSSFontFaceSrcValue.h"
@@ -331,5 +330,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,8 +21,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
namespace WebCore {
@@ -70,5 +68,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontFaceElement : SVGElement {
+interface SVGFontFaceElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGFontFaceFormatElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceFormatElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceFormatElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -18,8 +18,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGFontFaceFormatElement.h"
#include "SVGFontFaceElement.h"
@@ -60,5 +58,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceFormatElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceFormatElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceFormatElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
namespace WebCore {
@@ -38,5 +36,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceFormatElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceFormatElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceFormatElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontFaceFormatElement : SVGElement {
+interface SVGFontFaceFormatElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGFontFaceNameElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceNameElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceNameElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -18,8 +18,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGFontFaceNameElement.h"
#include "CSSFontFaceSrcValue.h"
@@ -47,6 +45,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
-
Modified: trunk/Source/WebCore/svg/SVGFontFaceNameElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceNameElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceNameElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
namespace WebCore {
@@ -41,5 +39,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceNameElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceNameElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceNameElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontFaceNameElement : SVGElement {
+interface SVGFontFaceNameElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGFontFaceSrcElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceSrcElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceSrcElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -18,8 +18,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGFontFaceSrcElement.h"
#include "CSSFontFaceSrcValue.h"
@@ -71,5 +69,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceSrcElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceSrcElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceSrcElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
namespace WebCore {
@@ -42,5 +40,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceSrcElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceSrcElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceSrcElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontFaceSrcElement : SVGElement {
+interface SVGFontFaceSrcElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGFontFaceUriElement.h"
#include "CSSFontFaceSrcValue.h"
@@ -119,5 +117,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "CachedFontClient.h"
#include "CachedResourceHandle.h"
#include "SVGElement.h"
@@ -52,5 +50,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGFontFaceUriElement : SVGElement {
+interface SVGFontFaceUriElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGGlyphElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,7 +21,6 @@
#include "config.h"
-#if ENABLE(SVG_FONTS)
#include "SVGGlyphElement.h"
#include "SVGFontElement.h"
@@ -46,5 +45,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGGlyphElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,8 +21,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
namespace WebCore {
@@ -42,5 +40,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGGlyphElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGGlyphElement : SVGElement {
+interface SVGGlyphElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphRefElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGGlyphRefElement.h"
#include "SVGGlyphElement.h"
@@ -99,5 +97,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGGlyphRefElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphRefElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphRefElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -20,8 +20,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include "SVGURIReference.h"
@@ -60,5 +58,3 @@
};
}
-
-#endif
Modified: trunk/Source/WebCore/svg/SVGGlyphRefElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGGlyphRefElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGGlyphRefElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -17,9 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGGlyphRefElement : SVGElement {
+interface SVGGlyphRefElement : SVGElement {
[Reflect=glyphRef] attribute DOMString glyphRef;
[Reflect] attribute DOMString format;
attribute unrestricted float x;
Modified: trunk/Source/WebCore/svg/SVGHKernElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGHKernElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGHKernElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -20,8 +20,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGHKernElement.h"
#include "SVGFontElement.h"
@@ -88,5 +86,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGHKernElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGHKernElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGHKernElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -21,8 +21,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGFontElement.h"
namespace WebCore {
@@ -41,5 +39,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGHKernElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGHKernElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGHKernElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -17,8 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGHKernElement : SVGElement {
+interface SVGHKernElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGMissingGlyphElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGMissingGlyphElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGMissingGlyphElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,7 +19,6 @@
#include "config.h"
-#if ENABLE(SVG_FONTS)
#include "SVGMissingGlyphElement.h"
#include "SVGNames.h"
#include <wtf/IsoMallocInlines.h>
@@ -40,5 +39,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGMissingGlyphElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGMissingGlyphElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGMissingGlyphElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include "SVGNames.h"
@@ -38,5 +36,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGMissingGlyphElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGMissingGlyphElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGMissingGlyphElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -23,8 +23,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGMissingGlyphElement : SVGElement {
+interface SVGMissingGlyphElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/SVGTRefElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGTRefElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGTRefElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -204,9 +204,7 @@
{
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)))
Modified: trunk/Source/WebCore/svg/SVGTSpanElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGTSpanElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGTSpanElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -50,9 +50,7 @@
{
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;
@@ -64,9 +62,7 @@
{
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)))
Modified: trunk/Source/WebCore/svg/SVGTests.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGTests.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGTests.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -42,13 +42,11 @@
{
static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> features = [] {
static const char* const features10[] = {
-#if ENABLE(SVG_FONTS)
"dom",
"dom.svg",
"dom.svg.static",
"svg",
"svg.static",
-#endif
};
static const char* const features11[] = {
"animation",
@@ -87,7 +85,6 @@
"view",
"viewportattribute",
"xlinkattribute",
-#if ENABLE(SVG_FONTS)
"basicfont",
"font",
"svg",
@@ -94,7 +91,6 @@
"svg-static",
"svgdom",
"svgdom-static",
-#endif
};
HashSet<String, ASCIICaseInsensitiveHash> set;
for (auto& feature : features10)
Modified: trunk/Source/WebCore/svg/SVGTextElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGTextElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGTextElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -76,9 +76,7 @@
{
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))
Modified: trunk/Source/WebCore/svg/SVGTextPositioningElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGTextPositioningElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGTextPositioningElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -124,9 +124,7 @@
if (!is<SVGTextElement>(element)
&& !is<SVGTSpanElement>(element)
-#if ENABLE(SVG_FONTS)
&& !is<SVGAltGlyphElement>(element)
-#endif
&& !is<SVGTRefElement>(element))
return nullptr;
Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -26,8 +26,6 @@
#include "config.h"
#include "SVGToOTFFontConversion.h"
-#if ENABLE(SVG_FONTS)
-
#include "CSSStyleDeclaration.h"
#include "ElementChildIterator.h"
#include "Glyph.h"
@@ -1575,5 +1573,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGVKernElement.cpp (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGVKernElement.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGVKernElement.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -18,8 +18,6 @@
*/
#include "config.h"
-
-#if ENABLE(SVG_FONTS)
#include "SVGVKernElement.h"
#include "SVGFontElement.h"
@@ -87,5 +85,3 @@
}
}
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGVKernElement.h (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGVKernElement.h 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGVKernElement.h 2020-09-23 19:50:23 UTC (rev 267497)
@@ -19,8 +19,6 @@
#pragma once
-#if ENABLE(SVG_FONTS)
-
#include "SVGElement.h"
#include "SVGFontElement.h"
@@ -40,5 +38,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(SVG_FONTS)
Modified: trunk/Source/WebCore/svg/SVGVKernElement.idl (267496 => 267497)
--- trunk/Source/WebCore/svg/SVGVKernElement.idl 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/SVGVKernElement.idl 2020-09-23 19:50:23 UTC (rev 267497)
@@ -17,8 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-[
- Conditional=SVG_FONTS
-] interface SVGVKernElement : SVGElement {
+interface SVGVKernElement : SVGElement {
};
Modified: trunk/Source/WebCore/svg/svgtags.in (267496 => 267497)
--- trunk/Source/WebCore/svg/svgtags.in 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebCore/svg/svgtags.in 2020-09-23 19:50:23 UTC (rev 267497)
@@ -4,11 +4,9 @@
fallbackJSInterfaceName="SVGElement"
a
-#if ENABLE_SVG_FONTS
altGlyph
altGlyphDef
altGlyphItem
-#endif
animate
animateColor
animateMotion
@@ -49,7 +47,6 @@
feTile
feTurbulence
filter
-#if ENABLE_SVG_FONTS
font
font_face
font_face_format
@@ -56,14 +53,11 @@
font_face_name
font_face_src
font_face_uri
-#endif
foreignObject
g
-#if ENABLE_SVG_FONTS
glyph
glyphRef
hkern interfaceName=SVGHKernElement
-#endif
image
line
linearGradient
@@ -70,9 +64,7 @@
marker
mask
metadata
-#if ENABLE_SVG_FONTS
missing_glyph
-#endif
mpath interfaceName=SVGMPathElement
path
pattern
@@ -93,6 +85,4 @@
tspan interfaceName=SVGTSpanElement
use
view
-#if ENABLE_SVG_FONTS
vkern interfaceName=SVGVKernElement
-#endif
Modified: trunk/Source/WebKit/ChangeLog (267496 => 267497)
--- trunk/Source/WebKit/ChangeLog 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebKit/ChangeLog 2020-09-23 19:50:23 UTC (rev 267497)
@@ -1,3 +1,13 @@
+2020-09-23 Fujii Hironori <[email protected]>
+
+ Remove ENABLE_SVG_FONTS macro
+ https://bugs.webkit.org/show_bug.cgi?id=216850
+
+ Reviewed by Don Olmstead.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::maximumBufferingTime):
+
2020-09-23 Per Arne Vollan <[email protected]>
[macOS] Change name of client decoder entitlement
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (267496 => 267497)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2020-09-23 19:50:23 UTC (rev 267497)
@@ -134,9 +134,7 @@
case CachedResource::Type::Ping:
case CachedResource::Type::CSSStyleSheet:
case CachedResource::Type::Script:
-#if ENABLE(SVG_FONTS)
case CachedResource::Type::SVGFontResource:
-#endif
case CachedResource::Type::FontResource:
#if ENABLE(APPLICATION_MANIFEST)
case CachedResource::Type::ApplicationManifest:
Modified: trunk/Source/cmake/OptionsFTW.cmake (267496 => 267497)
--- trunk/Source/cmake/OptionsFTW.cmake 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/OptionsFTW.cmake 2020-09-23 19:50:23 UTC (rev 267497)
@@ -99,7 +99,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_SLIDER PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_UNIFIED_BUILDS PRIVATE ON)
Modified: trunk/Source/cmake/OptionsMac.cmake (267496 => 267497)
--- trunk/Source/cmake/OptionsMac.cmake 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/OptionsMac.cmake 2020-09-23 19:50:23 UTC (rev 267497)
@@ -83,7 +83,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
Modified: trunk/Source/cmake/OptionsWin.cmake (267496 => 267497)
--- trunk/Source/cmake/OptionsWin.cmake 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/OptionsWin.cmake 2020-09-23 19:50:23 UTC (rev 267497)
@@ -53,7 +53,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (267496 => 267497)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-09-23 19:50:23 UTC (rev 267497)
@@ -205,7 +205,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG Fonts support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle automatic text size adjustment support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" PRIVATE OFF)
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (267496 => 267497)
--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2020-09-23 19:50:23 UTC (rev 267497)
@@ -55,7 +55,6 @@
<ENABLE_STYLE_SCOPED />
<ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
<ENABLE_SVG_DOM_OBJC_BINDINGS />
- <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
<ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
<ENABLE_WEB_AUDIO />
<ENABLE_WEB_AUTHN />
@@ -70,7 +69,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <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_INPU
T_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>
+ <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>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -286,10 +285,6 @@
<Value>$(ENABLE_SVG_DOM_OBJC_BINDINGS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_SVG_FONTS">
- <Value>$(ENABLE_SVG_FONTS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_VIDEO">
<Value>$(ENABLE_VIDEO)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (267496 => 267497)
--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2020-09-23 19:50:23 UTC (rev 267497)
@@ -55,7 +55,6 @@
<ENABLE_STYLE_SCOPED />
<ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
<ENABLE_SVG_DOM_OBJC_BINDINGS />
- <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
<ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
<ENABLE_WEB_AUDIO />
<ENABLE_WEB_AUTHN />
@@ -70,7 +69,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <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_INPU
T_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>
+ <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>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -286,14 +285,6 @@
<Value>$(ENABLE_SVG_DOM_OBJC_BINDINGS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_SVG_FONTS">
- <Value>$(ENABLE_SVG_FONTS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
- <BuildMacro Include="ENABLE_VIDEO">
- <Value>$(ENABLE_VIDEO)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_WEB_AUDIO">
<Value>$(ENABLE_WEB_AUDIO)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Tools/ChangeLog (267496 => 267497)
--- trunk/Tools/ChangeLog 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Tools/ChangeLog 2020-09-23 19:50:23 UTC (rev 267497)
@@ -1,3 +1,12 @@
+2020-09-23 Fujii Hironori <[email protected]>
+
+ Remove ENABLE_SVG_FONTS macro
+ https://bugs.webkit.org/show_bug.cgi?id=216850
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2020-09-23 Aakash Jain <[email protected]>
Limit number of emails to send for flaky and pre-existing API and layout test failures
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (267496 => 267497)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-09-23 19:39:48 UTC (rev 267496)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-09-23 19:50:23 UTC (rev 267497)
@@ -510,9 +510,6 @@
{ option => "spellcheck", desc => "Toggle Spellchecking support (requires Enchant)",
define => "ENABLE_SPELLCHECK", value => \$spellcheckSupport },
- { option => "svg-fonts", desc => "Toggle SVG Fonts support",
- define => "ENABLE_SVG_FONTS", value => \$svgFontsSupport },
-
{ option => "telephone-number-detection", desc => "Toggle telephone number detection support",
define => "ENABLE_TELEPHONE_NUMBER_DETECTION", value => \$telephoneNumberDetectionSupport },
