⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 268965 in webkit


Ignore:
Timestamp:
Oct 26, 2020, 2:35:09 AM (6 years ago)
Author:
zandobersek@gmail.com
Message:

Remove Accelerated2dCanvasEnabled WebPreferences entry
​https://bugs.webkit.org/show_bug.cgi?id=218114

Reviewed by Adrian Perez de Castro.

Source/WebKit:

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:

Source/WebKitLegacy/mac:

  • WebView/WebPreferences.mm:

(-[WebPreferences accelerated2dCanvasEnabled]): Make the API function
no-op and move it into the deprecated section.
(-[WebPreferences setAccelerated2dCanvasEnabled:]): Ditto.

Source/WTF:

  • Scripts/Preferences/WebPreferences.yaml:

Remove the Accelerated2dCanvasEnabled key after the underlying code
was removed in r268453.

Tools:

  • TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:

(testWebKitSettings): Adjust the test case to properly evaluate the
deprecated no-op behavior.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r268853 r268965  
     12020-10-26  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove Accelerated2dCanvasEnabled WebPreferences entry
     4        https://bugs.webkit.org/show_bug.cgi?id=218114
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * Scripts/Preferences/WebPreferences.yaml:
     9        Remove the Accelerated2dCanvasEnabled key after the underlying code
     10        was removed in r268453.
     11
    1122020-10-21  Alex Christensen  <achristensen@webkit.org>
    213

  • trunk/Source/WTF/Scripts/Preferences/WebPreferences.yaml

    r268719 r268965  
    4545      default: true
    4646
    47 Accelerated2dCanvasEnabled:
    48   type: bool
    49   defaultValue:
    50     WebKitLegacy:
    51       default: false
    52     WebKit:
    53       default: false
    54     WebCore:
    55       default: false
    56 
    5747AcceleratedCompositingEnabled:
    5848  type: bool

  • trunk/Source/WebKit/ChangeLog

    r268946 r268965  
     12020-10-26  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove Accelerated2dCanvasEnabled WebPreferences entry
     4        https://bugs.webkit.org/show_bug.cgi?id=218114
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        With the removal of the Accelerated2dCanvasEnabled preference key,
     9        relevant API functions in the WK2 C API are made no-op. Similar
     10        thing is done for the relevant GLib API, with the addition of marking
     11        relevant API funcions as deprecated.
     12
     13        * Shared/API/c/WKDeprecatedFunctions.cpp:
     14        (WKPreferencesSetAccelerated2DCanvasEnabled):
     15        (WKPreferencesGetAccelerated2DCanvasEnabled):
     16        * UIProcess/API/C/WKPreferences.cpp:
     17        (WKPreferencesSetAccelerated2DCanvasEnabled): Deleted.
     18        (WKPreferencesGetAccelerated2DCanvasEnabled): Deleted.
     19        * UIProcess/API/glib/WebKitSettings.cpp:
     20        (webKitSettingsSetProperty):
     21        (webKitSettingsGetProperty):
     22        (webkit_settings_class_init):
     23        (webkit_settings_get_enable_accelerated_2d_canvas):
     24        (webkit_settings_set_enable_accelerated_2d_canvas):
     25        * UIProcess/API/gtk/WebKitSettings.h:
     26        * UIProcess/API/wpe/WPEView.cpp:
     27        (WKWPE::m_backend):
     28        * UIProcess/API/wpe/WebKitSettings.h:
     29
    1302020-10-22  Ryosuke Niwa  <rniwa@webkit.org>
    231

  • trunk/Source/WebKit/Shared/API/c/WKDeprecatedFunctions.cpp

    r236930 r268965  
    6767    return nullptr;
    6868}
     69
     70void WKPreferencesSetAccelerated2DCanvasEnabled(WKPreferencesRef, bool)
     71{
     72}
     73
     74bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef)
     75{
     76    return false;
     77}

  • trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

    r268628 r268965  
    487487}
    488488
    489 void WKPreferencesSetAccelerated2DCanvasEnabled(WKPreferencesRef preferencesRef, bool flag)
    490 {
    491     toImpl(preferencesRef)->setAccelerated2dCanvasEnabled(flag);
    492 }
    493 
    494 bool WKPreferencesGetAccelerated2DCanvasEnabled(WKPreferencesRef preferencesRef)
    495 {
    496     return toImpl(preferencesRef)->accelerated2dCanvasEnabled();
    497 }
    498 
    499489void WKPreferencesSetNeedsSiteSpecificQuirks(WKPreferencesRef preferencesRef, bool flag)
    500490{

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

    r266718 r268965  
    357357        break;
    358358    case PROP_ENABLE_ACCELERATED_2D_CANVAS:
     359        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    359360        webkit_settings_set_enable_accelerated_2d_canvas(settings, g_value_get_boolean(value));
     361        ALLOW_DEPRECATED_DECLARATIONS_END
    360362        break;
    361363    case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
    … …  
    551553        break;
    552554    case PROP_ENABLE_ACCELERATED_2D_CANVAS:
     555        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    553556        g_value_set_boolean(value, webkit_settings_get_enable_accelerated_2d_canvas(settings));
     557        ALLOW_DEPRECATED_DECLARATIONS_END
    554558        break;
    555559    case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
    … …  
    12741278     *
    12751279     * Since: 2.2
     1280     *
     1281     * Deprecated: 2.32.
    12761282     */
    12771283    g_object_class_install_property(gObjectClass,
    … …  
    31683174 *
    31693175 * Since: 2.2
     3176 *
     3177 * Deprecated: 2.32.
    31703178 */
    31713179gboolean webkit_settings_get_enable_accelerated_2d_canvas(WebKitSettings* settings)
    … …  
    31733181    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
    31743182
    3175     return settings->priv->preferences->accelerated2dCanvasEnabled();
     3183    return false;
    31763184}
    31773185
    … …  
    31843192 *
    31853193 * Since: 2.2
     3194 *
     3195 * Deprecated: 2.32.
    31863196 */
    31873197void webkit_settings_set_enable_accelerated_2d_canvas(WebKitSettings* settings, gboolean enabled)
    31883198{
    31893199    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
    3190 
    3191     WebKitSettingsPrivate* priv = settings->priv;
    3192     if (priv->preferences->accelerated2dCanvasEnabled() == enabled)
    3193         return;
    3194 
    3195     priv->preferences->setAccelerated2dCanvasEnabled(enabled);
    3196     g_object_notify(G_OBJECT(settings), "enable-accelerated-2d-canvas");
    31973200}
    31983201

  • trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h

    r265753 r268965  
    396396                                                                gboolean        enabled);
    397397
    398 WEBKIT_API gboolean
     398WEBKIT_DEPRECATED gboolean
    399399webkit_settings_get_enable_accelerated_2d_canvas               (WebKitSettings *settings);
    400400
    401 WEBKIT_API void
     401WEBKIT_DEPRECATED void
    402402webkit_settings_set_enable_accelerated_2d_canvas               (WebKitSettings *settings,
    403403                                                                gboolean        enabled);

  • trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp

    r259112 r268965  
    6666        preferences->setForceCompositingMode(true);
    6767        preferences->setThreadedScrollingEnabled(true);
    68         preferences->setAccelerated2dCanvasEnabled(true);
    6968        preferences->setWebGLEnabled(true);
    7069        preferences->setDeveloperExtrasEnabled(true);

  • trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h

    r265753 r268965  
    373373                                                                gboolean        enabled);
    374374
    375 WEBKIT_API gboolean
     375WEBKIT_DEPRECATED gboolean
    376376webkit_settings_get_enable_accelerated_2d_canvas               (WebKitSettings *settings);
    377377
    378 WEBKIT_API void
     378WEBKIT_DEPRECATED void
    379379webkit_settings_set_enable_accelerated_2d_canvas               (WebKitSettings *settings,
    380380                                                                gboolean        enabled);

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r268813 r268965  
     12020-10-26  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove Accelerated2dCanvasEnabled WebPreferences entry
     4        https://bugs.webkit.org/show_bug.cgi?id=218114
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * WebView/WebPreferences.mm:
     9        (-[WebPreferences accelerated2dCanvasEnabled]): Make the API function
     10        no-op and move it into the deprecated section.
     11        (-[WebPreferences setAccelerated2dCanvasEnabled:]): Ditto.
     12
    1132020-10-21  Devin Rousso  <drousso@apple.com>
    214

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r268762 r268965  
    18711871}
    18721872
    1873 - (BOOL)accelerated2dCanvasEnabled
    1874 {
    1875     return [self _boolValueForKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
    1876 }
    1877 
    1878 - (void)setAccelerated2dCanvasEnabled:(BOOL)enabled
    1879 {
    1880     [self _setBoolValue:enabled forKey:WebKitAccelerated2dCanvasEnabledPreferenceKey];
    1881 }
    1882 
    18831873- (BOOL)isFrameFlatteningEnabled
    18841874{
    … …  
    34883478}
    34893479
     3480- (void)setAccelerated2dCanvasEnabled:(BOOL)enabled
     3481{
     3482}
     3483
     3484- (BOOL)accelerated2dCanvasEnabled
     3485{
     3486    return NO;
     3487}
     3488
    34903489@end

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h

    r268762 r268965  
    165165@property (nonatomic) BOOL webGLEnabled;
    166166@property (nonatomic, getter=forceLowPowerGPUForWebGL) BOOL forceWebGLUsesLowPower;
    167 @property (nonatomic) BOOL accelerated2dCanvasEnabled;
    168167@property (nonatomic) BOOL paginateDuringLayoutEnabled;
    169168@property (nonatomic) BOOL hyperlinkAuditingEnabled;
    … …  
    367366@property (nonatomic, getter=isVideoPluginProxyEnabled) BOOL videoPluginProxyEnabled;
    368367@property (nonatomic, getter=isHixie76WebSocketProtocolEnabled) BOOL hixie76WebSocketProtocolEnabled;
     368@property (nonatomic) BOOL accelerated2dCanvasEnabled;
    369369
    370370- (void)setDiskImageCacheEnabled:(BOOL)enabled;

  • trunk/Tools/ChangeLog

    r268946 r268965  
     12020-10-26  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove Accelerated2dCanvasEnabled WebPreferences entry
     4        https://bugs.webkit.org/show_bug.cgi?id=218114
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
     9        (testWebKitSettings): Adjust the test case to properly evaluate the
     10        deprecated no-op behavior.
     11
    1122020-10-22  Ryosuke Niwa  <rniwa@webkit.org>
    213

  • trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp

    r265753 r268965  
    282282    g_assert_true(webkit_settings_get_enable_smooth_scrolling(settings));
    283283
    284     // By default, accelerated 2D canvas is disabled.
    285     g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
    286     webkit_settings_set_enable_accelerated_2d_canvas(settings, TRUE);
    287     g_assert_true(webkit_settings_get_enable_accelerated_2d_canvas(settings));
    288 
    289284    // By default, writing of console messages to stdout is disabled.
    290285    g_assert_false(webkit_settings_get_enable_write_console_messages_to_stdout(settings));
    … …  
    366361    webkit_settings_set_enable_javascript_markup(settings, FALSE);
    367362    g_assert_false(webkit_settings_get_enable_javascript_markup(settings));
     363
     364ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     365    // Accelerated 2D canvas setting is deprecated and no-op.
     366    g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
     367    webkit_settings_set_enable_accelerated_2d_canvas(settings, TRUE);
     368    g_assert_false(webkit_settings_get_enable_accelerated_2d_canvas(settings));
     369ALLOW_DEPRECATED_DECLARATIONS_END
    368370
    369371    g_object_unref(G_OBJECT(settings));
Note: See TracChangeset for help on using the changeset viewer.