Changeset 231004 in webkit


Ignore:
Timestamp:
Apr 25, 2018 11:41:13 AM (6 years ago)
Author:
Michael Catanzaro
Message:

[WPE] Remove deprecated functions and properties from the API
​https://bugs.webkit.org/show_bug.cgi?id=179295

Reviewed by Žan Doberšek.

Source/WebKit:

  • UIProcess/API/glib/WebKitCookieManager.cpp:
  • UIProcess/API/glib/WebKitFormSubmissionRequest.cpp:
  • UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:

(webkitNavigationPolicyDecisionGetProperty):
(webkit_navigation_policy_decision_class_init):

  • UIProcess/API/glib/WebKitSettings.cpp:

(webKitSettingsSetProperty):
(webKitSettingsGetProperty):
(webkit_settings_class_init):

  • UIProcess/API/glib/WebKitWebContext.cpp:

(webkitWebContextGetProperty):
(webkitWebContextSetProperty):
(webkit_web_context_class_init):

  • UIProcess/API/glib/WebKitWebView.cpp:

(webkit_web_view_class_init):
(webkitWebViewHandleAuthenticationChallenge):
(webkitWebViewWebProcessTerminated):

  • UIProcess/API/wpe/WebKitCookieManager.h:
  • UIProcess/API/wpe/WebKitFormSubmissionRequest.h:
  • UIProcess/API/wpe/WebKitNavigationPolicyDecision.h:
  • UIProcess/API/wpe/WebKitSettings.h:
  • UIProcess/API/wpe/WebKitWebContext.h:

Tools:

  • TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp:

(testWebViewAuthenticationStorage): Disable this test for now. It will require some effort
to rewrite LoadTrackingTest to not require the web view at construction time.

  • TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:

(testWebKitSettings): Don't test private browsing setting, which is gone.

  • TestWebKitAPI/glib/CMakeLists.txt: Disable TestCookieManager for now.
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r230997 r231004  
     12018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Remove deprecated functions and properties from the API
     4        https://bugs.webkit.org/show_bug.cgi?id=179295
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * UIProcess/API/glib/WebKitCookieManager.cpp:
     9        * UIProcess/API/glib/WebKitFormSubmissionRequest.cpp:
     10        * UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp:
     11        (webkitNavigationPolicyDecisionGetProperty):
     12        (webkit_navigation_policy_decision_class_init):
     13        * UIProcess/API/glib/WebKitSettings.cpp:
     14        (webKitSettingsSetProperty):
     15        (webKitSettingsGetProperty):
     16        (webkit_settings_class_init):
     17        * UIProcess/API/glib/WebKitWebContext.cpp:
     18        (webkitWebContextGetProperty):
     19        (webkitWebContextSetProperty):
     20        (webkit_web_context_class_init):
     21        * UIProcess/API/glib/WebKitWebView.cpp:
     22        (webkit_web_view_class_init):
     23        (webkitWebViewHandleAuthenticationChallenge):
     24        (webkitWebViewWebProcessTerminated):
     25        * UIProcess/API/wpe/WebKitCookieManager.h:
     26        * UIProcess/API/wpe/WebKitFormSubmissionRequest.h:
     27        * UIProcess/API/wpe/WebKitNavigationPolicyDecision.h:
     28        * UIProcess/API/wpe/WebKitSettings.h:
     29        * UIProcess/API/wpe/WebKitWebContext.h:
     30
    1312018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
    232

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

    r225054 r231004  
    421421}
    422422
     423#if PLATFORM(GTK)
    423424/**
    424425 * webkit_cookie_manager_get_domains_with_cookies:
    … …  
    519520    webkit_website_data_manager_clear(manager->priv->dataManager, WEBKIT_WEBSITE_DATA_COOKIES, 0, nullptr, nullptr, nullptr);
    520521}
     522#endif

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

    r226264 r231004  
    8787}
    8888
     89#if PLATFORM(GTK)
    8990/**
    9091 * webkit_form_submission_request_get_text_fields:
    … …  
    116117    return request->priv->values.get();
    117118}
     119#endif
    118120
    119121/**

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

    r224677 r231004  
    6060    PROP_0,
    6161    PROP_NAVIGATION_ACTION,
     62#if PLATFORM(GTK)
    6263    PROP_NAVIGATION_TYPE,
    6364    PROP_MOUSE_BUTTON,
    6465    PROP_MODIFIERS,
    6566    PROP_REQUEST,
     67#endif
    6668    PROP_FRAME_NAME,
    6769};
    … …  
    7476        g_value_set_boxed(value, webkit_navigation_policy_decision_get_navigation_action(decision));
    7577        break;
     78#if PLATFORM(GTK)
    7679    case PROP_NAVIGATION_TYPE:
    7780        g_value_set_enum(value, webkit_navigation_action_get_navigation_type(decision->priv->navigationAction));
    … …  
    8689        g_value_set_object(value, webkit_navigation_action_get_request(decision->priv->navigationAction));
    8790        break;
     91#endif
    8892    case PROP_FRAME_NAME:
    8993        g_value_set_string(value, webkit_navigation_policy_decision_get_frame_name(decision));
    … …  
    117121            WEBKIT_PARAM_READABLE));
    118122
     123#if PLATFORM(GTK)
    119124    /**
    120125     * WebKitNavigationPolicyDecision:navigation-type:
    … …  
    188193                                                      WEBKIT_TYPE_URI_REQUEST,
    189194                                                      WEBKIT_PARAM_READABLE));
     195#endif
    190196
    191197    /**
    … …  
    222228}
    223229
     230#if PLATFORM(GTK)
    224231/**
    225232 * webkit_navigation_policy_decision_get_navigation_type:
    … …  
    285292    return webkit_navigation_action_get_request(decision->priv->navigationAction);
    286293}
     294#endif
    287295
    288296/**

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

    r227607 r231004  
    128128    PROP_MINIMUM_FONT_SIZE,
    129129    PROP_DEFAULT_CHARSET,
     130#if PLATFORM(GTK)
    130131    PROP_ENABLE_PRIVATE_BROWSING,
     132#endif
    131133    PROP_ENABLE_DEVELOPER_EXTRAS,
    132134    PROP_ENABLE_RESIZABLE_TEXT_AREAS,
    … …  
    267269        webkit_settings_set_default_charset(settings, g_value_get_string(value));
    268270        break;
     271#if PLATFORM(GTK)
    269272    case PROP_ENABLE_PRIVATE_BROWSING:
    270273        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
    … …  
    272275        G_GNUC_END_IGNORE_DEPRECATIONS;
    273276        break;
     277#endif
    274278    case PROP_ENABLE_DEVELOPER_EXTRAS:
    275279        webkit_settings_set_enable_developer_extras(settings, g_value_get_boolean(value));
    … …  
    444448        g_value_set_string(value, webkit_settings_get_default_charset(settings));
    445449        break;
     450#if PLATFORM(GTK)
    446451    case PROP_ENABLE_PRIVATE_BROWSING:
    447452        G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
    … …  
    449454        G_GNUC_END_IGNORE_DEPRECATIONS;
    450455        break;
     456#endif
    451457    case PROP_ENABLE_DEVELOPER_EXTRAS:
    452458        g_value_set_boolean(value, webkit_settings_get_enable_developer_extras(settings));
    … …  
    880886                                                        readWriteConstructParamFlags));
    881887
     888#if PLATFORM(GTK)
    882889    /**
    883890     * WebKitSettings:enable-private-browsing:
    … …  
    895902                                                         FALSE,
    896903                                                         readWriteConstructParamFlags));
     904#endif
    897905
    898906    /**
    … …  
    22432251}
    22442252
     2253#if PLATFORM(GTK)
    22452254/**
    22462255 * webkit_settings_get_enable_private_browsing:
    … …  
    22812290    g_object_notify(G_OBJECT(settings), "enable-private-browsing");
    22822291}
     2292#endif
    22832293
    22842294/**

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

    r230661 r231004  
    110110    PROP_0,
    111111
     112#if PLATFORM(GTK)
    112113    PROP_LOCAL_STORAGE_DIRECTORY,
     114#endif
    113115    PROP_WEBSITE_DATA_MANAGER
    114116};
    … …  
    274276
    275277    switch (propID) {
     278#if PLATFORM(GTK)
    276279    case PROP_LOCAL_STORAGE_DIRECTORY:
    277280        g_value_set_string(value, context->priv->localStorageDirectory.data());
    278281        break;
     282#endif
    279283    case PROP_WEBSITE_DATA_MANAGER:
    280284        g_value_set_object(value, webkit_web_context_get_website_data_manager(context));
    … …  
    290294
    291295    switch (propID) {
     296#if PLATFORM(GTK)
    292297    case PROP_LOCAL_STORAGE_DIRECTORY:
    293298        context->priv->localStorageDirectory = g_value_get_string(value);
    294299        break;
     300#endif
    295301    case PROP_WEBSITE_DATA_MANAGER: {
    296302        gpointer manager = g_value_get_object(value);
    … …  
    397403    gObjectClass->dispose = webkitWebContextDispose;
    398404
     405#if PLATFORM(GTK)
    399406    /**
    400407     * WebKitWebContext:local-storage-directory:
    … …  
    415422            nullptr,
    416423            static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
     424#endif
    417425
    418426    /**
    … …  
    13401348}
    13411349
     1350#if PLATFORM(GTK)
    13421351/**
    13431352 * webkit_web_context_set_disk_cache_directory:
    … …  
    13621371    context->priv->processPool->configuration().setDiskCacheDirectory(WebCore::FileSystem::pathByAppendingComponent(WebCore::FileSystem::stringFromFileSystemRepresentation(directory), networkCacheSubdirectory));
    13631372}
     1373#endif
    13641374
    13651375/**

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

    r230557 r231004  
    146146    INSECURE_CONTENT_DETECTED,
    147147
     148#if PLATFORM(GTK)
    148149    WEB_PROCESS_CRASHED,
     150#endif
    149151    WEB_PROCESS_TERMINATED,
    150152
    … …  
    17891791            WEBKIT_TYPE_INSECURE_CONTENT_EVENT);
    17901792
     1793#if PLATFORM(GTK)
    17911794    /**
    17921795     * WebKitWebView::web-process-crashed:
    … …  
    18081811        g_cclosure_marshal_generic,
    18091812        G_TYPE_BOOLEAN, 0);
     1813#endif
    18101814
    18111815    /**
    … …  
    23432347void webkitWebViewHandleAuthenticationChallenge(WebKitWebView* webView, AuthenticationChallengeProxy* authenticationChallenge)
    23442348{
     2349#if PLATFORM(GTK)
    23452350    G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
    23462351    gboolean privateBrowsingEnabled = webView->priv->isEphemeral || webkit_settings_get_enable_private_browsing(webView->priv->settings.get());
    23472352    G_GNUC_END_IGNORE_DEPRECATIONS;
     2353#else
     2354    gboolean privateBrowsingEnabled = webView->priv->isEphemeral;
     2355#endif
    23482356    webView->priv->authenticationRequest = adoptGRef(webkitAuthenticationRequestCreate(authenticationChallenge, privateBrowsingEnabled));
    23492357    gboolean returnValue;
    … …  
    38343842void webkitWebViewWebProcessTerminated(WebKitWebView* webView, WebKitWebProcessTerminationReason reason)
    38353843{
     3844#if PLATFORM(GTK)
    38363845    if (reason == WEBKIT_WEB_PROCESS_CRASHED) {
    38373846        gboolean returnValue;
    38383847        g_signal_emit(webView, signals[WEB_PROCESS_CRASHED], 0, &returnValue);
    38393848    }
     3849#endif
    38403850    g_signal_emit(webView, signals[WEB_PROCESS_TERMINATED], 0, reason);
    38413851}

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

    r225054 r231004  
    146146                                                       GError                      **error);
    147147
    148 WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_fetch) void
    149 webkit_cookie_manager_get_domains_with_cookies        (WebKitCookieManager          *cookie_manager,
    150                                                        GCancellable                 *cancellable,
    151                                                        GAsyncReadyCallback           callback,
    152                                                        gpointer                      user_data);
    153 
    154 WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_fetch_finish) gchar **
    155 webkit_cookie_manager_get_domains_with_cookies_finish (WebKitCookieManager          *cookie_manager,
    156                                                        GAsyncResult                 *result,
    157                                                        GError                      **error);
    158 
    159 WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_remove) void
    160 webkit_cookie_manager_delete_cookies_for_domain       (WebKitCookieManager          *cookie_manager,
    161                                                        const gchar                  *domain);
    162 
    163 WEBKIT_DEPRECATED_FOR(webkit_website_data_manager_clear) void
    164 webkit_cookie_manager_delete_all_cookies              (WebKitCookieManager          *cookie_manager);
    165 
    166148G_END_DECLS
    167149

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

    r226264 r231004  
    6060webkit_form_submission_request_get_type         (void);
    6161
    62 WEBKIT_DEPRECATED_FOR(webkit_form_submission_request_list_text_fields) GHashTable *
    63 webkit_form_submission_request_get_text_fields  (WebKitFormSubmissionRequest  *request);
    64 
    6562WEBKIT_API gboolean
    6663webkit_form_submission_request_list_text_fields (WebKitFormSubmissionRequest  *request,

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

    r218553 r231004  
    6666webkit_navigation_policy_decision_get_navigation_action (WebKitNavigationPolicyDecision *decision);
    6767
    68 WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitNavigationType
    69 webkit_navigation_policy_decision_get_navigation_type   (WebKitNavigationPolicyDecision *decision);
    70 
    71 WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
    72 webkit_navigation_policy_decision_get_mouse_button      (WebKitNavigationPolicyDecision *decision);
    73 
    74 WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) guint
    75 webkit_navigation_policy_decision_get_modifiers         (WebKitNavigationPolicyDecision *decision);
    76 
    77 WEBKIT_DEPRECATED_FOR(webkit_navigation_policy_decision_get_navigation_action) WebKitURIRequest *
    78 webkit_navigation_policy_decision_get_request           (WebKitNavigationPolicyDecision *decision);
    79 
    8068WEBKIT_API const gchar *
    8169webkit_navigation_policy_decision_get_frame_name        (WebKitNavigationPolicyDecision *decision);

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

    r227607 r231004  
    237237                                                                const gchar    *default_charset);
    238238
    239 WEBKIT_DEPRECATED gboolean
    240 webkit_settings_get_enable_private_browsing                    (WebKitSettings *settings);
    241 
    242 WEBKIT_DEPRECATED void
    243 webkit_settings_set_enable_private_browsing                    (WebKitSettings *settings,
    244                                                                 gboolean        enabled);
    245 
    246239WEBKIT_API gboolean
    247240webkit_settings_get_enable_developer_extras                    (WebKitSettings *settings);

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

    r220903 r231004  
    285285                                                     const gchar                   *hostname);
    286286
    287 WEBKIT_DEPRECATED_FOR(webkit_web_context_new_with_website_data_manager) void
    288 webkit_web_context_set_disk_cache_directory         (WebKitWebContext              *context,
    289                                                      const gchar                   *directory);
    290 
    291287WEBKIT_API void
    292288webkit_web_context_allow_tls_certificate_for_host   (WebKitWebContext              *context,

  • trunk/Tools/ChangeLog

    r231003 r231004  
     12018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [WPE] Remove deprecated functions and properties from the API
     4        https://bugs.webkit.org/show_bug.cgi?id=179295
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * TestWebKitAPI/Tests/WebKitGLib/TestAuthentication.cpp:
     9        (testWebViewAuthenticationStorage): Disable this test for now. It will require some effort
     10        to rewrite LoadTrackingTest to not require the web view at construction time.
     11        * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
     12        (testWebKitSettings): Don't test private browsing setting, which is gone.
     13        * TestWebKitAPI/glib/CMakeLists.txt: Disable TestCookieManager for now.
     14
    1152018-04-25  Andy Estes  <aestes@apple.com>
    216

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

    r226782 r231004  
    185185}
    186186
     187// FIXME: Find a way to not use the private browsing setting and enable for WPE.
     188#if PLATFORM(GTK)
    187189static void testWebViewAuthenticationStorage(AuthenticationTest* test, gconstpointer)
    188190{
    … …  
    208210#endif
    209211}
     212#endif
    210213
    211214static void testWebViewAuthenticationSuccess(AuthenticationTest* test, gconstpointer)
    … …  
    417420    AuthenticationTest::add("Authentication", "authentication-failure", testWebViewAuthenticationFailure);
    418421    AuthenticationTest::add("Authentication", "authentication-no-credential", testWebViewAuthenticationNoCredential);
     422#if PLATFORM(GTK)
    419423    AuthenticationTest::add("Authentication", "authentication-storage", testWebViewAuthenticationStorage);
     424#endif
    420425    AuthenticationTest::add("Authentication", "authentication-empty-realm", testWebViewAuthenticationEmptyRealm);
    421426    ProxyAuthenticationTest::add("Authentication", "authentication-proxy", testWebViewAuthenticationProxy);

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

    r225182 r231004  
    201201    g_assert_cmpstr(webkit_settings_get_default_charset(settings), ==, "utf8");
    202202
     203#if PLATFORM(GTK)
    203204    G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
    204205    g_assert(!webkit_settings_get_enable_private_browsing(settings));
    … …  
    206207    g_assert(webkit_settings_get_enable_private_browsing(settings));
    207208    G_GNUC_END_IGNORE_DEPRECATIONS;
     209#endif
    208210
    209211    g_assert(!webkit_settings_get_enable_developer_extras(settings));

  • trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt

    r229973 r231004  
    121121ADD_WK2_TEST(TestAutomationSession ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestAutomationSession.cpp)
    122122ADD_WK2_TEST(TestBackForwardList ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestBackForwardList.cpp)
    123 ADD_WK2_TEST(TestCookieManager ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp)
    124123ADD_WK2_TEST(TestDownloads ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestDownloads.cpp)
    125124ADD_WK2_TEST(TestWebKitFaviconDatabase ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestWebKitFaviconDatabase.cpp)
    … …  
    142141ADD_WK2_TEST(TestConsoleMessage ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp)
    143142ADD_WK2_TEST(TestDOMElement ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestDOMElement.cpp)
     143
     144# FIXME: Enable for WPE
     145if (PORT STREQUAL "GTK")
     146    ADD_WK2_TEST(TestCookieManager ${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp)
     147endif ()
Note: See TracChangeset for help on using the changeset viewer.