Diff
Modified: trunk/Source/WTF/ChangeLog (268964 => 268965)
--- trunk/Source/WTF/ChangeLog 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WTF/ChangeLog 2020-10-26 09:35:09 UTC (rev 268965)
@@ -1,3 +1,14 @@
+2020-10-26 Zan Dobersek <[email protected]>
+
+ Remove Accelerated2dCanvasEnabled WebPreferences entry
+ https://bugs.webkit.org/show_bug.cgi?id=218114
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Scripts/Preferences/WebPreferences.yaml:
+ Remove the Accelerated2dCanvasEnabled key after the underlying code
+ was removed in r268453.
+
2020-10-21 Alex Christensen <[email protected]>
Update and pass new URL web platform tests
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml (268964 => 268965)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml 2020-10-26 09:35:09 UTC (rev 268965)
@@ -44,16 +44,6 @@
WebKit:
default: true
-Accelerated2dCanvasEnabled:
- type: bool
- defaultValue:
- WebKitLegacy:
- default: false
- WebKit:
- default: false
- WebCore:
- default: false
-
AcceleratedCompositingEnabled:
type: bool
webcoreOnChange: setNeedsRecalcStyleInAllFrames
Modified: trunk/Source/WebKit/ChangeLog (268964 => 268965)
--- trunk/Source/WebKit/ChangeLog 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/ChangeLog 2020-10-26 09:35:09 UTC (rev 268965)
@@ -1,3 +1,32 @@
+2020-10-26 Zan Dobersek <[email protected]>
+
+ Remove Accelerated2dCanvasEnabled WebPreferences entry
+ https://bugs.webkit.org/show_bug.cgi?id=218114
+
+ Reviewed by Adrian Perez de Castro.
+
+ With the removal of the Accelerated2dCanvasEnabled preference key,
+ relevant API functions in the WK2 C API are made no-op. Similar
+ thing is done for the relevant GLib API, with the addition of marking
+ relevant API funcions as deprecated.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKPreferencesSetAccelerated2DCanvasEnabled):
+ (WKPreferencesGetAccelerated2DCanvasEnabled):
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAccelerated2DCanvasEnabled): Deleted.
+ (WKPreferencesGetAccelerated2DCanvasEnabled): Deleted.
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_get_enable_accelerated_2d_canvas):
+ (webkit_settings_set_enable_accelerated_2d_canvas):
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/wpe/WPEView.cpp:
+ (WKWPE::m_backend):
+ * UIProcess/API/wpe/WebKitSettings.h:
+
2020-10-22 Ryosuke Niwa <[email protected]>
IPC testing API should expose ArrayBuffer for an unknown decoded argument
Modified: trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp (268964 => 268965)
--- trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp 2020-10-26 09:35:09 UTC (rev 268965)
@@ -66,3 +66,12 @@
{
return nullptr;
}
+
+void WKPreferencesSetAccelerated2DCanvasEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef)
+{
+ return false;
+}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (268964 => 268965)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2020-10-26 09:35:09 UTC (rev 268965)
@@ -486,16 +486,6 @@
return toImpl(preferencesRef)->webGLEnabled();
}
-void WKPreferencesSetAccelerated2DCanvasEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAccelerated2dCanvasEnabled(flag);
-}
-
-bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->accelerated2dCanvasEnabled();
-}
-
void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setNeedsSiteSpecificQuirks(flag);
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (268964 => 268965)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2020-10-26 09:35:09 UTC (rev 268965)
@@ -356,7 +356,9 @@
webkit_settings_set_enable_smooth_scrolling(settings, g_value_get_boolean(value));
break;
case PROP_ENABLE_ACCELERATED_2D_CANVAS:
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
webkit_settings_set_enable_accelerated_2d_canvas(settings, g_value_get_boolean(value));
+ ALLOW_DEPRECATED_DECLARATIONS_END
break;
case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
webkit_settings_set_enable_write_console_messages_to_stdout(settings, g_value_get_boolean(value));
@@ -550,7 +552,9 @@
g_value_set_boolean(value, webkit_settings_get_enable_smooth_scrolling(settings));
break;
case PROP_ENABLE_ACCELERATED_2D_CANVAS:
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
g_value_set_boolean(value, webkit_settings_get_enable_accelerated_2d_canvas(settings));
+ ALLOW_DEPRECATED_DECLARATIONS_END
break;
case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
g_value_set_boolean(value, webkit_settings_get_enable_write_console_messages_to_stdout(settings));
@@ -1273,6 +1277,8 @@
* using hardware accelerated drawing operations.
*
* Since: 2.2
+ *
+ * Deprecated: 2.32.
*/
g_object_class_install_property(gObjectClass,
PROP_ENABLE_ACCELERATED_2D_CANVAS,
@@ -3167,12 +3173,14 @@
* Returns: %TRUE if accelerated 2D canvas is enabled or %FALSE otherwise.
*
* Since: 2.2
+ *
+ * Deprecated: 2.32.
*/
gboolean webkit_settings_get_enable_accelerated_2d_canvas(WebKitSettings* settings)
{
g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
- return settings->priv->preferences->accelerated2dCanvasEnabled();
+ return false;
}
/**
@@ -3183,17 +3191,12 @@
* Set the #WebKitSettings:enable-accelerated-2d-canvas property.
*
* Since: 2.2
+ *
+ * Deprecated: 2.32.
*/
void webkit_settings_set_enable_accelerated_2d_canvas(WebKitSettings* settings, gboolean enabled)
{
g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
-
- WebKitSettingsPrivate* priv = settings->priv;
- if (priv->preferences->accelerated2dCanvasEnabled() == enabled)
- return;
-
- priv->preferences->setAccelerated2dCanvasEnabled(enabled);
- g_object_notify(G_OBJECT(settings), "enable-accelerated-2d-canvas");
}
/**
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h (268964 => 268965)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2020-10-26 09:35:09 UTC (rev 268965)
@@ -395,10 +395,10 @@
webkit_settings_set_enable_smooth_scrolling (WebKitSettings *settings,
gboolean enabled);
-WEBKIT_API gboolean
+WEBKIT_DEPRECATED gboolean
webkit_settings_get_enable_accelerated_2d_canvas (WebKitSettings *settings);
-WEBKIT_API void
+WEBKIT_DEPRECATED void
webkit_settings_set_enable_accelerated_2d_canvas (WebKitSettings *settings,
gboolean enabled);
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (268964 => 268965)
--- trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2020-10-26 09:35:09 UTC (rev 268965)
@@ -65,7 +65,6 @@
preferences->setAcceleratedCompositingEnabled(true);
preferences->setForceCompositingMode(true);
preferences->setThreadedScrollingEnabled(true);
- preferences->setAccelerated2dCanvasEnabled(true);
preferences->setWebGLEnabled(true);
preferences->setDeveloperExtrasEnabled(true);
}
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h (268964 => 268965)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2020-10-26 09:35:09 UTC (rev 268965)
@@ -372,10 +372,10 @@
webkit_settings_set_enable_smooth_scrolling (WebKitSettings *settings,
gboolean enabled);
-WEBKIT_API gboolean
+WEBKIT_DEPRECATED gboolean
webkit_settings_get_enable_accelerated_2d_canvas (WebKitSettings *settings);
-WEBKIT_API void
+WEBKIT_DEPRECATED void
webkit_settings_set_enable_accelerated_2d_canvas (WebKitSettings *settings,
gboolean enabled);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (268964 => 268965)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-10-26 09:35:09 UTC (rev 268965)
@@ -1,3 +1,15 @@
+2020-10-26 Zan Dobersek <[email protected]>
+
+ Remove Accelerated2dCanvasEnabled WebPreferences entry
+ https://bugs.webkit.org/show_bug.cgi?id=218114
+
+ Reviewed by Adrian Perez de Castro.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences accelerated2dCanvasEnabled]): Make the API function
+ no-op and move it into the deprecated section.
+ (-[WebPreferences setAccelerated2dCanvasEnabled:]): Ditto.
+
2020-10-21 Devin Rousso <[email protected]>
[macOS WK1] provide a way for Apple-internal clients to disable link preview
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (268964 => 268965)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm 2020-10-26 09:35:09 UTC (rev 268965)
@@ -1870,16 +1870,6 @@
[self _setBoolValue:forceLowPower forKey:WebKitForceWebGLUsesLowPowerPreferenceKey];
}
-- (BOOL)accelerated2dCanvasEnabled
-{
- return [self _boolValueForKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
-}
-
-- (void)setAccelerated2dCanvasEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
-}
-
- (BOOL)isFrameFlatteningEnabled
{
return [self _unsignedIntValueForKey:WebKitFrameFlatteningPreferenceKey] != WebKitFrameFlatteningDisabled;
@@ -3487,4 +3477,13 @@
{
}
+- (void)setAccelerated2dCanvasEnabled:(BOOL)enabled
+{
+}
+
+- (BOOL)accelerated2dCanvasEnabled
+{
+ return NO;
+}
+
@end
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (268964 => 268965)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2020-10-26 09:35:09 UTC (rev 268965)
@@ -164,7 +164,6 @@
@property (nonatomic) BOOL webAudioEnabled;
@property (nonatomic) BOOL webGLEnabled;
@property (nonatomic, getter=forceLowPowerGPUForWebGL) BOOL forceWebGLUsesLowPower;
-@property (nonatomic) BOOL accelerated2dCanvasEnabled;
@property (nonatomic) BOOL paginateDuringLayoutEnabled;
@property (nonatomic) BOOL hyperlinkAuditingEnabled;
@property (nonatomic) BOOL mediaPlaybackRequiresUserGesture; // Deprecated. Use videoPlaybackRequiresUserGesture and audioPlaybackRequiresUserGesture instead.
@@ -366,6 +365,7 @@
@property (nonatomic) BOOL customElementsEnabled;
@property (nonatomic, getter=isVideoPluginProxyEnabled) BOOL videoPluginProxyEnabled;
@property (nonatomic, getter=isHixie76WebSocketProtocolEnabled) BOOL hixie76WebSocketProtocolEnabled;
+@property (nonatomic) BOOL accelerated2dCanvasEnabled;
- (void)setDiskImageCacheEnabled:(BOOL)enabled;
Modified: trunk/Tools/ChangeLog (268964 => 268965)
--- trunk/Tools/ChangeLog 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Tools/ChangeLog 2020-10-26 09:35:09 UTC (rev 268965)
@@ -1,3 +1,14 @@
+2020-10-26 Zan Dobersek <[email protected]>
+
+ Remove Accelerated2dCanvasEnabled WebPreferences entry
+ https://bugs.webkit.org/show_bug.cgi?id=218114
+
+ Reviewed by Adrian Perez de Castro.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+ (testWebKitSettings): Adjust the test case to properly evaluate the
+ deprecated no-op behavior.
+
2020-10-22 Ryosuke Niwa <[email protected]>
IPC testing API should expose ArrayBuffer for an unknown decoded argument
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (268964 => 268965)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2020-10-26 09:02:03 UTC (rev 268964)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2020-10-26 09:35:09 UTC (rev 268965)
@@ -281,11 +281,6 @@
webkit_settings_set_enable_smooth_scrolling(settings, TRUE);
g_assert_true(webkit_settings_get_enable_smooth_scrolling(settings));
- // By default, accelerated 2D canvas is disabled.
- g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
- webkit_settings_set_enable_accelerated_2d_canvas(settings, TRUE);
- g_assert_true(webkit_settings_get_enable_accelerated_2d_canvas(settings));
-
// By default, writing of console messages to stdout is disabled.
g_assert_false(webkit_settings_get_enable_write_console_messages_to_stdout(settings));
webkit_settings_set_enable_write_console_messages_to_stdout(settings, TRUE);
@@ -366,6 +361,13 @@
webkit_settings_set_enable_javascript_markup(settings, FALSE);
g_assert_false(webkit_settings_get_enable_javascript_markup(settings));
+ALLOW_DEPRECATED_DECLARATIONS_BEGIN
+ // Accelerated 2D canvas setting is deprecated and no-op.
+ g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
+ webkit_settings_set_enable_accelerated_2d_canvas(settings, TRUE);
+ g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
+ALLOW_DEPRECATED_DECLARATIONS_END
+
g_object_unref(G_OBJECT(settings));
}
