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

Changeset 246353 in webkit


Ignore:
Timestamp:
Jun 12, 2019, 9:07:42 AM (7 years ago)
Author:
Michael Catanzaro
Message:

[WPE][GTK] Deprecate WebSQL APIs
​https://bugs.webkit.org/show_bug.cgi?id=195011

Reviewed by Carlos Garcia Campos.

Source/WebKit:

  • UIProcess/API/glib/WebKitSettings.cpp:

(webkit_settings_class_init):

  • UIProcess/API/glib/WebKitWebContext.cpp:

(webkitWebContextConstructed):

  • UIProcess/API/glib/WebKitWebsiteDataManager.cpp:

(webkitWebsiteDataManagerGetProperty):
(webkit_website_data_manager_class_init):

  • UIProcess/API/gtk/WebKitWebsiteData.h:
  • UIProcess/API/gtk/WebKitWebsiteDataManager.h:
  • UIProcess/API/wpe/WebKitWebsiteData.h:
  • UIProcess/API/wpe/WebKitWebsiteDataManager.h:

Tools:

  • MiniBrowser/gtk/main.c:

(gotWebsiteDataCallback):

  • TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:

(testWebsiteDataConfiguration):
(testWebsiteDataEphemeral):
(testWebsiteDataDatabases):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r246352 r246353  
     12019-06-12  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE][GTK] Deprecate WebSQL APIs
     4        https://bugs.webkit.org/show_bug.cgi?id=195011
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * UIProcess/API/glib/WebKitSettings.cpp:
     9        (webkit_settings_class_init):
     10        * UIProcess/API/glib/WebKitWebContext.cpp:
     11        (webkitWebContextConstructed):
     12        * UIProcess/API/glib/WebKitWebsiteDataManager.cpp:
     13        (webkitWebsiteDataManagerGetProperty):
     14        (webkit_website_data_manager_class_init):
     15        * UIProcess/API/gtk/WebKitWebsiteData.h:
     16        * UIProcess/API/gtk/WebKitWebsiteDataManager.h:
     17        * UIProcess/API/wpe/WebKitWebsiteData.h:
     18        * UIProcess/API/wpe/WebKitWebsiteDataManager.h:
     19
    1202019-06-12  Michael Catanzaro  <mcatanzaro@igalia.com>
    221

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

    r246352 r246353  
    682682     * WebKitSettings:enable-html5-database:
    683683     *
    684      * Whether to enable HTML5 client-side SQL database support. Client-side
    685      * SQL database allows web pages to store structured data and be able to
    686      * use SQL to manipulate that data asynchronously.
    687      *
    688      * HTML5 database specification is available at
    689      * http://www.w3.org/TR/webdatabase/.
     684     * Whether to enable HTML5 client-side SQL database support (IndexedDB).
    690685     */
    691686    g_object_class_install_property(gObjectClass,
    … …  
    17411736 * Get the #WebKitSettings:enable-html5-database property.
    17421737 *
    1743  * Returns: %TRUE If HTML5 database support is enabled or %FALSE otherwise.
     1738 * Returns: %TRUE if IndexedDB support is enabled or %FALSE otherwise.
    17441739 */
    17451740gboolean webkit_settings_get_enable_html5_database(WebKitSettings* settings)

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

    r246305 r246353  
    341341        configuration.setApplicationCacheDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_offline_application_cache_directory(priv->websiteDataManager.get())));
    342342        configuration.setIndexedDBDatabaseDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_indexeddb_directory(priv->websiteDataManager.get())));
     343ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    343344        configuration.setWebSQLDatabaseDirectory(FileSystem::stringFromFileSystemRepresentation(webkit_website_data_manager_get_websql_directory(priv->websiteDataManager.get())));
     345ALLOW_DEPRECATED_DECLARATIONS_END
    344346    } else if (!priv->localStorageDirectory.isNull())
    345347        configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));

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

    r240437 r246353  
    133133        break;
    134134    case PROP_WEBSQL_DIRECTORY:
     135        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    135136        g_value_set_string(value, webkit_website_data_manager_get_websql_directory(manager));
     137        ALLOW_DEPRECATED_DECLARATIONS_END
    136138        break;
    137139    case PROP_IS_EPHEMERAL:
    … …  
    318320     *
    319321     * Since: 2.10
     322     *
     323     * Deprecated: 2.24. WebSQL is no longer supported. Use IndexedDB instead.
    320324     */
    321325    g_object_class_install_property(
    … …  
    327331            _("The directory where WebSQL databases will be stored"),
    328332            nullptr,
    329             static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
     333            static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_DEPRECATED)));
    330334
    331335    /**
    … …  
    593597 *
    594598 * Since: 2.10
     599 *
     600 * Deprecated: 2.24. WebSQL is no longer supported. Use IndexedDB instead.
    595601 */
    596602const gchar* webkit_website_data_manager_get_websql_directory(WebKitWebsiteDataManager* manager)

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

    r238372 r246353  
    4141 * @WEBKIT_WEBSITE_DATA_SESSION_STORAGE: Session storage data.
    4242 * @WEBKIT_WEBSITE_DATA_LOCAL_STORAGE: Local storage data.
    43  * @WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES: WebSQL databases.
     43 * @WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES: WebSQL databases. Deprecated 2.24
    4444 * @WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES: IndexedDB databases.
    4545 * @WEBKIT_WEBSITE_DATA_PLUGIN_DATA: Plugins data.

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

    r232010 r246353  
    8888webkit_website_data_manager_get_indexeddb_directory                   (WebKitWebsiteDataManager *manager);
    8989
    90 WEBKIT_API const gchar *
     90WEBKIT_DEPRECATED const gchar *
    9191webkit_website_data_manager_get_websql_directory                      (WebKitWebsiteDataManager *manager);
    9292

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

    r238372 r246353  
    4141 * @WEBKIT_WEBSITE_DATA_SESSION_STORAGE: Session storage data.
    4242 * @WEBKIT_WEBSITE_DATA_LOCAL_STORAGE: Local storage data.
    43  * @WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES: WebSQL databases.
     43 * @WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES: WebSQL databases. Deprecated 2.24
    4444 * @WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES: IndexedDB databases.
    4545 * @WEBKIT_WEBSITE_DATA_PLUGIN_DATA: Plugins data.

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

    r232010 r246353  
    8888webkit_website_data_manager_get_indexeddb_directory                   (WebKitWebsiteDataManager *manager);
    8989
    90 WEBKIT_API const gchar *
     90WEBKIT_DEPRECATED const gchar *
    9191webkit_website_data_manager_get_websql_directory                      (WebKitWebsiteDataManager *manager);
    9292

  • trunk/Tools/ChangeLog

    r246352 r246353  
     12019-06-12  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE][GTK] Deprecate WebSQL APIs
     4        https://bugs.webkit.org/show_bug.cgi?id=195011
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * MiniBrowser/gtk/main.c:
     9        (gotWebsiteDataCallback):
     10        * TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:
     11        (testWebsiteDataConfiguration):
     12        (testWebsiteDataEphemeral):
     13        (testWebsiteDataDatabases):
     14
    1152019-06-12  Michael Catanzaro  <mcatanzaro@igalia.com>
    216

  • trunk/Tools/MiniBrowser/gtk/main.c

    r244635 r246353  
    414414    aboutDataFillTable(result, dataRequest, dataList, "Session Storage", WEBKIT_WEBSITE_DATA_SESSION_STORAGE, NULL, pageID);
    415415    aboutDataFillTable(result, dataRequest, dataList, "Local Storage", WEBKIT_WEBSITE_DATA_LOCAL_STORAGE, webkit_website_data_manager_get_local_storage_directory(manager), pageID);
    416     aboutDataFillTable(result, dataRequest, dataList, "WebSQL Databases", WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES, webkit_website_data_manager_get_websql_directory(manager), pageID);
    417416    aboutDataFillTable(result, dataRequest, dataList, "IndexedDB Databases", WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES, webkit_website_data_manager_get_indexeddb_directory(manager), pageID);
    418417    aboutDataFillTable(result, dataRequest, dataList, "Plugins Data", WEBKIT_WEBSITE_DATA_PLUGIN_DATA, NULL, pageID);

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

    r239772 r246353  
    149149    g_assert_true(g_file_test(indexedDBDirectory.get(), G_FILE_TEST_IS_DIR));
    150150
    151     GUniquePtr<char> webSQLDirectory(g_build_filename(Test::dataDirectory(), "websql", nullptr));
    152     g_assert_cmpstr(webSQLDirectory.get(), ==, webkit_website_data_manager_get_websql_directory(test->m_manager));
    153     test->runJavaScriptAndWaitUntilFinished("db = openDatabase(\"TestDatabase\", \"1.0\", \"TestDatabase\", 1);", nullptr);
    154     g_assert_true(g_file_test(webSQLDirectory.get(), G_FILE_TEST_IS_DIR));
    155 
    156151    test->loadURI(kServer->getURIForPath("/appcache").data());
    157152    test->waitUntilLoadFinished();
    … …  
    170165    // Clear all persistent caches, since the data dir is common to all test cases.
    171166    static const WebKitWebsiteDataTypes persistentCaches = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_DISK_CACHE | WEBKIT_WEBSITE_DATA_LOCAL_STORAGE
    172         | WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE | WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT);
     167        | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE | WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT);
    173168    test->clear(persistentCaches, 0);
    174169    g_assert_null(test->fetch(persistentCaches));
    … …  
    182177    g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(test->m_manager), !=, webkit_website_data_manager_get_disk_cache_directory(defaultManager));
    183178    g_assert_cmpstr(webkit_website_data_manager_get_offline_application_cache_directory(test->m_manager), !=, webkit_website_data_manager_get_offline_application_cache_directory(defaultManager));
    184     g_assert_cmpstr(webkit_website_data_manager_get_websql_directory(test->m_manager), !=, webkit_website_data_manager_get_websql_directory(defaultManager));
    185179
    186180    // Using Test::dataDirectory() we get the default configuration but for a differrent prefix.
    … …  
    196190    applicationCacheDirectory.reset(g_build_filename(Test::dataDirectory(), "applications", nullptr));
    197191    g_assert_cmpstr(webkit_website_data_manager_get_offline_application_cache_directory(baseDataManager.get()), ==, applicationCacheDirectory.get());
    198 
    199     webSQLDirectory.reset(g_build_filename(Test::dataDirectory(), "databases", nullptr));
    200     g_assert_cmpstr(webkit_website_data_manager_get_websql_directory(baseDataManager.get()), ==, webSQLDirectory.get());
    201192
    202193    g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
    … …  
    211202    // The result should be the same as previous manager.
    212203    g_assert_cmpstr(webkit_website_data_manager_get_local_storage_directory(baseDataManager.get()), ==, localStorageDirectory.get());
    213     g_assert_cmpstr(webkit_website_data_manager_get_websql_directory(baseDataManager.get()), ==, webSQLDirectory.get());
    214204    g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
    215205}
    … …  
    233223    g_assert_null(webkit_website_data_manager_get_offline_application_cache_directory(manager.get()));
    234224    g_assert_null(webkit_website_data_manager_get_indexeddb_directory(manager.get()));
    235     g_assert_null(webkit_website_data_manager_get_websql_directory(manager.get()));
    236225
    237226    // Configuration is ignored when is-ephemeral is used.
    … …  
    417406static void testWebsiteDataDatabases(WebsiteDataTest* test, gconstpointer)
    418407{
    419     static const WebKitWebsiteDataTypes databaseTypes = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES);
     408    static const WebKitWebsiteDataTypes databaseTypes = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES);
    420409    GList* dataList = test->fetch(databaseTypes);
    421410    g_assert_null(dataList);
    … …  
    446435    // Database sizes are unknown.
    447436    g_assert_cmpuint(webkit_website_data_get_size(data, WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES), ==, 0);
    448     g_assert_cmpuint(webkit_website_data_get_size(data, WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES), ==, 0);
    449437
    450438    // Remove all databases at once.
Note: See TracChangeset for help on using the changeset viewer.