From 3b6472353773deb3531f59a008bf191db7a43f9a Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Thu, 19 Sep 2024 19:11:43 +0200 Subject: [PATCH] Disable webkit_settings_set_enable_2d_canvas_acceleration on non-Skia builds Bug: https://bugs.webkit.org/show_bug.cgi?id=279220 Bug-Debian: https://bugs.debian.org/1082149 Origin: https://commits.webkit.org/283863@main =================================================================== Gbp-Pq: Name fix-epiphany-ftbfs.patch --- Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml | 1 + Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml index b7b6baa24c..ac1797039c 100644 --- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml +++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml @@ -1634,6 +1634,7 @@ CanvasUsesAcceleratedDrawing: type: bool status: embedder humanReadableName: "Canvas uses accelerated drawing" + condition: USE(CA) || USE(SKIA) defaultValue: WebKitLegacy: "PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)": true diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp index defb96355f..a7980c6d96 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp @@ -1307,7 +1307,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass) "enable-accelerated-2d-canvas", _("Enable accelerated 2D canvas"), _("Whether to enable accelerated 2D canvas"), - FEATURE_DEFAULT(CanvasUsesAcceleratedDrawing), + FALSE, static_cast(readWriteConstructParamFlags | G_PARAM_DEPRECATED)); #endif @@ -1326,7 +1326,11 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass) "enable-2d-canvas-acceleration", _("Enable 2D canvas acceleration"), _("Whether to enable 2D canvas acceleration"), +#if USE(SKIA) FEATURE_DEFAULT(CanvasUsesAcceleratedDrawing), +#else + FALSE, +#endif readWriteConstructParamFlags); /** -- 2.30.2