[webkit-changes] [WebKit/WebKit] df21fc: [GLib] Remove WebKitJavascriptResult

Michael Catanzaro noreply at github.com
Tue Mar 7 01:15:14 PST 2023 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: df21fc613d9758638def91a94598d5da6eb6d6a2
      https://github.com/WebKit/WebKit/commit/df21fc613d9758638def91a94598d5da6eb6d6a2
  Author: Michael Catanzaro <mcatanzaro at redhat.com>
  Date:   2023-03-07 (Tue, 07 Mar 2023)

  Changed paths:
    M Source/WebKit/PlatformGTK.cmake
    M Source/WebKit/PlatformGTKDeprecated.cmake
    M Source/WebKit/PlatformWPE.cmake
    M Source/WebKit/PlatformWPEDeprecated.cmake
    M Source/WebKit/SourcesGTK.txt
    M Source/WebKit/SourcesGTKDeprecated.txt
    M Source/WebKit/SourcesWPE.txt
    M Source/WebKit/SourcesWPEDeprecated.txt
    M Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.cpp
    M Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in
    M Source/WebKit/UIProcess/API/glib/WebKitJavascriptResultPrivate.h
    M Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
    M Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
    M Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in
    M Source/WebKit/UIProcess/API/glib/webkit.h.in
    M Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp
    M Source/WebKit/gtk/migrating-to-webkitgtk-6.0.md
    M Tools/MiniBrowser/gtk/main.c
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestGeolocationManager.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestInputMethodContext.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitPolicyClient.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspectorServer.cpp
    M Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp
    M Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp
    M Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h

  Log Message:
  -----------
  [GLib] Remove WebKitJavascriptResult
https://bugs.webkit.org/show_bug.cgi?id=253476

Reviewed by Carlos Garcia Campos.

WebKitJavascriptResult is not actually doing anything useful anymore, so
get rid of it in the new API version by replacing it with direct use of
JSCValue.

In the old API version, all APIs added in 2.40 are also changed to use
JSCValue.

This also fixes some suspicious use of webkit_javascript_result_unref()
in TestWebKitWebView.cpp where multiple functions, including
testWebViewDefaultContentSecurityPolicy, were unreffing the
WebKitJavascriptResult returned by
WebViewTest::runJavaScriptAndWaitUntilFinished, but that is owned by
WebViewTest itself.

* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/PlatformGTKDeprecated.cmake:
* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/PlatformWPEDeprecated.cmake:
* Source/WebKit/SourcesGTK.txt:
* Source/WebKit/SourcesGTKDeprecated.txt:
* Source/WebKit/SourcesWPE.txt:
* Source/WebKit/SourcesWPEDeprecated.txt:
* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.cpp:
* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.h.in:
* Source/WebKit/UIProcess/API/glib/WebKitJavascriptResultPrivate.h:
* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp:
(webkit_user_content_manager_new): Deleted.
(webkit_user_content_manager_add_style_sheet): Deleted.
(webkit_user_content_manager_remove_style_sheet): Deleted.
(webkit_user_content_manager_remove_all_style_sheets): Deleted.
(webkit_user_content_manager_add_script): Deleted.
(webkit_user_content_manager_remove_script): Deleted.
(webkit_user_content_manager_remove_all_scripts): Deleted.
(_WebKitScriptMessageReply::_WebKitScriptMessageReply): Deleted.
(_WebKitScriptMessageReply::sendValue): Deleted.
(_WebKitScriptMessageReply::sendErrorMessage): Deleted.
(_WebKitScriptMessageReply::~_WebKitScriptMessageReply): Deleted.
(webkit_script_message_reply_ref): Deleted.
(webkit_script_message_reply_unref): Deleted.
(webKitScriptMessageReplyCreate): Deleted.
(webkit_script_message_reply_return_value): Deleted.
(webkit_script_message_reply_return_error_message): Deleted.
(webkit_user_content_manager_register_script_message_handler): Deleted.
(webkit_user_content_manager_unregister_script_message_handler): Deleted.
(webkit_user_content_manager_register_script_message_handler_with_reply): Deleted.
(webkit_user_content_manager_register_script_message_handler_in_world): Deleted.
(webkit_user_content_manager_unregister_script_message_handler_in_world): Deleted.
(webkit_user_content_manager_add_filter): Deleted.
(webkit_user_content_manager_remove_filter): Deleted.
(webkit_user_content_manager_remove_filter_by_id): Deleted.
(webkit_user_content_manager_remove_all_filters): Deleted.
(webkitUserContentManagerGetUserContentControllerProxy): Deleted.
* Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp:
(webkitWebViewRunJavaScriptWithParams):
(webkitWebViewRunJavascriptWithoutForcedUserGestures):
(webkitWebViewEvaluateJavascriptInternal):
(webkit_web_view_evaluate_javascript):
(webkit_web_view_evaluate_javascript_finish):
(webkitWebViewCallAsyncJavascriptFunctionInternal):
(webkit_web_view_call_async_javascript_function):
(webkit_web_view_call_async_javascript_function_finish):
(webkit_web_view_run_javascript):
(webkit_web_view_run_javascript_in_world):
(webkit_web_view_run_async_javascript_function_in_world):
(resourcesStreamReadCallback):
* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in:
* Source/WebKit/UIProcess/API/glib/webkit.h.in:
* Source/WebKit/UIProcess/API/wpe/qt/WPEQtView.cpp:
(jsAsyncReadyCallback):
* Source/WebKit/gtk/migrating-to-webkitgtk-6.0.md:
* Tools/MiniBrowser/gtk/main.c:
(aboutDataScriptMessageReceivedCallback):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestConsoleMessage.cpp:
(ConsoleMessageTest::consoleMessageReceivedCallback):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestGeolocationManager.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestInputMethodContext.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestSSL.cpp:
(WebSocketTest::webSocketTestResultCallback):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp:
(testWebExtensionIsolatedWorld):
(testWebExtensionWindowObjectCleared):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitPolicyClient.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitUserContentManager.cpp:
(isStyleSheetInjectedForURLAtPath):
(isScriptInjectedForURLAtPath):
(UserScriptMessageTest::scriptMessageReceived):
(UserScriptMessageTest::waitUntilMessageReceived):
(UserScriptMessageTest::postMessageAndWaitUntilReceived):
(UserScriptMessageTest::asyncScriptMessageReceived):
(UserScriptMessageTest::waitUntilPromiseResolved):
(UserScriptMessageTest::postMessageAndWaitForPromiseResolved):
(testUserContentManagerScriptMessageReceived):
(testUserContentManagerScriptMessageInWorldReceived):
(testUserContentManagerScriptMessageWithReplyReceived):
(testUserContentManagerScriptMessageFromDOMBindings):
(isCSSBlockedForURLAtPath):
(UserScriptMessageTest::UserScriptMessageTest): Deleted.
(UserScriptMessageTest::~UserScriptMessageTest): Deleted.
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebContext.cpp:
(testWebContextURIScheme):
(testWebContextLanguages):
(xhrMessageReceivedCallback):
(testWebContextSecurityFileXHR):
(testWebContextTimeZoneOverride):
(testWebContextTimeZoneOverrideInWorker):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp:
(testWebViewRunAsyncFunctions):
(testWebViewRunJavaScript):
(testWebViewPageVisibility):
(testWebViewDocumentFocus):
(testWebViewCORSAllowlist):
(testWebViewDefaultContentSecurityPolicy):
(testWebViewWebExtensionMode):
(testWebViewDisableWebSecurity):
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:
(testWebViewHandleCorruptedLocalStorage):
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestInspectorServer.cpp:
(testInspectorServerPageList):
(testInspectorHTTPServerPageList):
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebViewEditor.cpp:
(testWebViewEditorInsertImage):
(testWebViewEditorCreateLink):
* Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:
(WebViewTest::~WebViewTest):
(WebViewTest::assertJavaScriptBecomesTrue):
(runJavaScriptReadyCallback):
(runAsyncJavaScriptFunctionInWorldReadyCallback):
(WebViewTest::runJavaScriptAndWaitUntilFinished):
(WebViewTest::runJavaScriptFromGResourceAndWaitUntilFinished):
(WebViewTest::runJavaScriptInWorldAndWaitUntilFinished):
(WebViewTest::runAsyncJavaScriptFunctionInWorldAndWaitUntilFinished):
(WebViewTest::runJavaScriptWithoutForcedUserGesturesAndWaitUntilFinished):
(WebViewTest::javascriptResultToCString):
(WebViewTest::javascriptResultToNumber):
(WebViewTest::javascriptResultToBoolean):
(WebViewTest::javascriptResultIsNull):
(WebViewTest::javascriptResultIsUndefined):
(WebViewTest::runWebProcessTest):
* Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h:

Canonical link: https://commits.webkit.org/261320@main

More information about the webkit-changes mailing list