From ad0f017da033b17116dad7cad6e9e06e475f540d Mon Sep 17 00:00:00 2001 From: Tim Nguyen Date: Fri, 6 Jan 2023 02:02:07 -0800 Subject: [PATCH] Remove OffscreenCanvasEnabled from DeprecatedGlobalSettings https://bugs.webkit.org/show_bug.cgi?id=250177 rdar://103943700 Reviewed by Ryosuke Niwa. Use EnabledBySetting instead of EnabledByDeprecatedGlobalSetting. * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/html/HTMLCanvasElement.idl: * Source/WebCore/html/OffscreenCanvas.idl: * Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl: * Source/WebCore/page/DeprecatedGlobalSettings.h: (WebCore::DeprecatedGlobalSettings::setOffscreenCanvasEnabled): Deleted. (WebCore::DeprecatedGlobalSettings::offscreenCanvasEnabled): Deleted. Canonical link: https://commits.webkit.org/258532@main --- Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml | 4 +++- Source/WebCore/html/HTMLCanvasElement.idl | 2 +- Source/WebCore/html/OffscreenCanvas.idl | 2 +- .../html/canvas/OffscreenCanvasRenderingContext2D.idl | 2 +- Source/WebCore/page/DeprecatedGlobalSettings.h | 8 -------- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml index a1ff5ea0a2d1..d555d45e0ec1 100644 --- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml @@ -4112,7 +4112,6 @@ OffscreenCanvasEnabled: status: testable humanReadableName: "OffscreenCanvas" humanReadableDescription: "Support for the OffscreenCanvas APIs" - webcoreBinding: DeprecatedGlobalSettings condition: ENABLE(OFFSCREEN_CANVAS) defaultValue: WebKitLegacy: @@ -4122,6 +4121,9 @@ OffscreenCanvasEnabled: "PLATFORM(COCOA)": true "ENABLE(EXPERIMENTAL_FEATURES)": true default: false + WebCore: + "PLATFORM(COCOA)": true + default: false OffscreenCanvasInWorkersEnabled: type: bool diff --git a/Source/WebCore/html/HTMLCanvasElement.idl b/Source/WebCore/html/HTMLCanvasElement.idl index 8f108163a081..2a54d6df134b 100644 --- a/Source/WebCore/html/HTMLCanvasElement.idl +++ b/Source/WebCore/html/HTMLCanvasElement.idl @@ -53,7 +53,7 @@ typedef ( DOMString toDataURL(optional DOMString type, optional any quality); undefined toBlob(BlobCallback callback, optional DOMString type, optional any quality); - [Conditional=OFFSCREEN_CANVAS, EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled, NewObject] OffscreenCanvas transferControlToOffscreen(); + [Conditional=OFFSCREEN_CANVAS, EnabledBySetting=OffscreenCanvasEnabled, NewObject] OffscreenCanvas transferControlToOffscreen(); [Conditional=MEDIA_STREAM, NewObject] MediaStream captureStream(optional double frameRequestRate); }; diff --git a/Source/WebCore/html/OffscreenCanvas.idl b/Source/WebCore/html/OffscreenCanvas.idl index fc86a8bb076c..d4987a7d96f7 100644 --- a/Source/WebCore/html/OffscreenCanvas.idl +++ b/Source/WebCore/html/OffscreenCanvas.idl @@ -49,7 +49,7 @@ enum OffscreenRenderingContextType [ GenerateIsReachable=Impl, - EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled, + EnabledBySetting=OffscreenCanvasEnabled, Conditional=OFFSCREEN_CANVAS, ConditionalForWorker=OFFSCREEN_CANVAS_IN_WORKERS, EnabledForContext, diff --git a/Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl b/Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl index 06a9ccc70723..b3b93f897d4c 100644 --- a/Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl +++ b/Source/WebCore/html/canvas/OffscreenCanvasRenderingContext2D.idl @@ -25,7 +25,7 @@ [ CustomIsReachable, - EnabledByDeprecatedGlobalSetting=OffscreenCanvasEnabled, + EnabledBySetting=OffscreenCanvasEnabled, Conditional=OFFSCREEN_CANVAS, ConditionalForWorker=OFFSCREEN_CANVAS_IN_WORKERS, EnabledForContext, diff --git a/Source/WebCore/page/DeprecatedGlobalSettings.h b/Source/WebCore/page/DeprecatedGlobalSettings.h index f01daad3de2d..f0b0dda8ca29 100644 --- a/Source/WebCore/page/DeprecatedGlobalSettings.h +++ b/Source/WebCore/page/DeprecatedGlobalSettings.h @@ -94,11 +94,6 @@ class DeprecatedGlobalSettings { static void setCustomPasteboardDataEnabled(bool isEnabled) { shared().m_isCustomPasteboardDataEnabled = isEnabled; } static bool customPasteboardDataEnabled() { return shared().m_isCustomPasteboardDataEnabled; } -#if ENABLE(OFFSCREEN_CANVAS) - static void setOffscreenCanvasEnabled(bool isEnabled) { shared().m_isOffscreenCanvasEnabled = isEnabled; } - static bool offscreenCanvasEnabled() { return shared().m_isOffscreenCanvasEnabled; } -#endif - #if ENABLE(OFFSCREEN_CANVAS_IN_WORKERS) static void setOffscreenCanvasInWorkersEnabled(bool isEnabled) { shared().m_isOffscreenCanvasInWorkersEnabled = isEnabled; } static bool offscreenCanvasInWorkersEnabled() { return shared().m_isOffscreenCanvasInWorkersEnabled; } @@ -289,9 +284,6 @@ class DeprecatedGlobalSettings { bool m_isPaintTimingEnabled { false }; bool m_isMenuItemElementEnabled { false }; bool m_isCustomPasteboardDataEnabled { false }; -#if ENABLE(OFFSCREEN_CANVAS) - bool m_isOffscreenCanvasEnabled { false }; -#endif #if ENABLE(OFFSCREEN_CANVAS_IN_WORKERS) bool m_isOffscreenCanvasInWorkersEnabled { false }; #endif