CSS Font Loading API: Remove FontFaceSet constructor

vitorroriz · vitorroriz · commit c58996cc188d · 2025-12-23T14:12:42.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=276794 rdar://132031306 Reviewed by Simon Fraser. The FontFaceSet constructor was considered not useful and is to be removed from the FontFaceSet interface as per [1] resolution. [1] w3c/csswg-drafts#10390 * LayoutTests/fast/text/font-face-api-preinstalled.html: * LayoutTests/fast/text/font-face-set-document-expected.txt: * LayoutTests/fast/text/font-face-set-document.html: * LayoutTests/fast/text/font-face-set-javascript.html: * LayoutTests/fast/text/font-loading-multiple-sets.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected-expected.txt: Removed. * LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected.html: Removed. Remove fontfaceset-add-css-connected.html as it fundamentally requires the FontFaceSet constructor to function. The test verifies that CSS-connected FontFace objects cannot be added to a separate FontFaceSet instance, but without the constructor, there is no way to create such a separate instance in a document context. This test scenario becomes impossible once the constructor is removed per the CSSWG resolution mentioned above [1]. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h: * Source/WebCore/css/FontFaceSet.idl: * Source/WebKit/Shared/WebPreferencesDefaultValues.cpp: (WebKit::defaultFontFaceSetConstructorEnabled): * Source/WebKit/Shared/WebPreferencesDefaultValues.h: * Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h: * Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm: (WebKit::defaultFontFaceSetConstructorEnabled): Canonical link: https://commits.webkit.org/304912@main
diff --git a/LayoutTests/fast/text/font-face-api-preinstalled.html b/LayoutTests/fast/text/font-face-api-preinstalled.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ FontFaceSetConstructorEnabled=true ] -->
 <html>
 <head>
 <script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/text/font-face-set-document.html b/LayoutTests/fast/text/font-face-set-document.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ FontFaceSetConstructorEnabled=true ] -->
 <html>
 <head>
 <script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/fast/text/font-face-set-javascript.html b/LayoutTests/fast/text/font-face-set-javascript.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ FontFaceSetConstructorEnabled=true ] -->
 <head>
 <script src="../../resources/js-test-pre.js"></script>
 </head>
diff --git a/LayoutTests/fast/text/font-loading-multiple-sets.html b/LayoutTests/fast/text/font-loading-multiple-sets.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ FontFaceSetConstructorEnabled=true ] -->
 <html>
 <head>
 <script src="../../resources/js-test-pre.js"></script>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected-expected.txt
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-add-css-connected.html
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -3154,6 +3154,20 @@ FlexFormattingContextIntegrationEnabled:
     WebCore:
       default: true
 
+FontFaceSetConstructorEnabled:
+  type: bool
+  status: developer
+  category: dom
+  humanReadableName: "Legacy FontFaceSet Constructor API"
+  humanReadableDescription: "Legacy FontFaceSet Constructor API"
+  defaultValue:
+    WebKitLegacy:
+      default: WebKit::defaultFontFaceSetConstructorEnabled()
+    WebKit:
+      default: WebKit::defaultFontFaceSetConstructorEnabled()
+    WebCore:
+      default: false
+
 ForceAlwaysUserScalable:
   type: bool
   status: internal
diff --git a/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h b/Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h
@@ -133,6 +133,7 @@ enum class SDKAlignedBehavior {
     ExecutionTimingChangeOfModuleScripts,
     GetBoundingClientRectZoomed,
     CrashWhenMutatingProcessAssertionsFromBackgroundThread,
+    NoFontFaceSetConstructor,
 
     NumberOfBehaviors
 };
diff --git a/Source/WebCore/css/FontFaceSet.idl b/Source/WebCore/css/FontFaceSet.idl
@@ -34,7 +34,7 @@ enum FontFaceSetLoadStatus {
     ActiveDOMObject,
     Exposed=(Window,Worker)
 ] interface FontFaceSet : EventTarget {
-    [CallWith=CurrentScriptExecutionContext] constructor(sequence<FontFace> initialFaces);
+    [EnabledBySetting=FontFaceSetConstructorEnabled, CallWith=CurrentScriptExecutionContext] constructor(sequence<FontFace> initialFaces);
 
     boolean has(FontFace font);
 
diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
@@ -454,6 +454,16 @@ bool defaultFacebookLiveRecordingQuirkEnabled()
 #endif
 }
 
+bool defaultFontFaceSetConstructorEnabled()
+{
+#if PLATFORM(COCOA)
+    static bool newSDK = linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::NoFontFaceSetConstructor);
+    return !newSDK;
+#else
+    return false;
+#endif
+}
+
 #if !PLATFORM(COCOA)
 bool defaultContentInsetBackgroundFillEnabled()
 {
diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.h b/Source/WebKit/Shared/WebPreferencesDefaultValues.h
@@ -204,6 +204,7 @@ bool defaultTrustedTypesEnabled();
 
 bool defaultGetBoundingClientRectZoomedEnabled();
 bool defaultFacebookLiveRecordingQuirkEnabled();
+bool defaultFontFaceSetConstructorEnabled();
 
 #if HAVE(MATERIAL_HOSTING)
 bool defaultHostedBlurMaterialInMediaControlsEnabled();
diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h b/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.h
@@ -42,7 +42,6 @@ bool defaultAllowsPictureInPictureMediaPlayback();
 bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute();
 bool defaultPassiveTouchListenersAsDefaultOnDocument();
 bool defaultRequiresUserGestureToLoadVideo();
-bool defaultShowModalDialogEnabled();
 bool defaultWebSQLEnabled();
 bool defaultAllowContentSecurityPolicySourceStarToMatchAnyProtocol();
 #endif
@@ -63,6 +62,8 @@ bool defaultAttachmentElementEnabled();
 bool defaultShouldRestrictBaseURLSchemes();
 bool defaultShouldConvertInvalidURLsToBlank();
 bool defaultPopoverAttributeEnabled();
+bool defaultShowModalDialogEnabled();
+bool defaultFontFaceSetConstructorEnabled();
 
 #if PLATFORM(MAC)
 bool defaultPassiveWheelListenersAsDefaultOnDocument();
diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm b/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm
@@ -156,6 +156,12 @@ bool defaultNeedsKeyboardEventDisambiguationQuirks()
 
 #endif // PLATFORM(MAC)
 
+bool defaultFontFaceSetConstructorEnabled()
+{
+    static bool newSDK = linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::NoFontFaceSetConstructor);
+    return !newSDK;
+}
+
 bool defaultMutationEventsEnabled()
 {
     return WTF::CocoaApplication::isAppleApplication() || !linkedOnOrAfterSDKWithBehavior(SDKAlignedBehavior::MutationEventsDisabledByDefault);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!DOCTYPE html><!-- webkit-test-runner [ FontFaceSetConstructorEnabled=true ] -->`
`2`	`2`	`<html>`
`3`	`3`	`<head>`
`4`	`4`	`<script src="../../resources/js-test-pre.js"></script>`