Attachment 340105 Details for Bug 185518 – [WPE][Stable] Remove unusable JavaScript APIs

[patch] [WPE][Stable] Remove unusable JavaScript APIs

bug-185518-20180510125523.patch (text/plain), 10.96 KB, created by Michael Catanzaro on 2018-05-10 10:55:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-05-10 10:55:24 PDT

Size: 10.96 KB

patch

obsolete

>Subversion Revision: 231640
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 479c57bec3628d538a381cc69fa5f73bda6fea36..08154d3e6d1b4377c22291175b00e8b5b2259ef5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][Stable] Remove unusable JavaScript APIs
>+        https://bugs.webkit.org/show_bug.cgi?id=185518
>+
>+        There is no JSC API provided with WPE 2.20. We don't want to expose the old C API, because
>+        that is going to be obsolete in 2.22. And backporting the new GObject API to this branch
>+        would be inappropriate.
>+
>+        This means that we need to remove WebKitJavascriptResult.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformWPE.cmake:
>+        * UIProcess/API/glib/WebKitUserContentManager.cpp:
>+        * UIProcess/API/glib/WebKitWebView.cpp:
>+        * UIProcess/API/wpe/WebKitUserContentManager.h:
>+        * UIProcess/API/wpe/WebKitWebView.h:
>+        * UIProcess/API/wpe/webkit.h:
>+        * WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp:
>+        * WebProcess/InjectedBundle/API/wpe/WebKitFrame.h:
>+
> 2018-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed, install WebKitHitTestResult.h
>diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
>index 4dd10aaa6bf3e522b559f87eefe23d77bf995690..69f92c84deb9b64009048263061bcaf04f51be92 100644
>--- a/Source/WebKit/PlatformWPE.cmake
>+++ b/Source/WebKit/PlatformWPE.cmake
>@@ -109,7 +109,6 @@ set(WPE_API_INSTALLED_HEADERS
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitGeolocationPermissionRequest.h
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitHitTestResult.h
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h
>-    ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitJavascriptResult.h
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitMimeInfo.h
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationAction.h
>     ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
>index 22832604a63cb651c52c930a93a094c4ed5b0501..15a86be7f77316280d88d9e4f7806e22deeb27aa 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
>@@ -77,6 +77,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
> 
> static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass* klass)
> {
>+#if PLATFORM(GTK)
>     GObjectClass* gObjectClass = G_OBJECT_CLASS(klass);
> 
>     /**
>@@ -100,6 +101,7 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass
>             g_cclosure_marshal_VOID__BOXED,
>             G_TYPE_NONE, 1,
>             WEBKIT_TYPE_JAVASCRIPT_RESULT);
>+#endif
> }
> 
> /**
>@@ -180,6 +182,7 @@ void webkit_user_content_manager_remove_all_scripts(WebKitUserContentManager* ma
>     manager->priv->userContentController->removeAllUserScripts();
> }
> 
>+#if PLATFORM(GTK)
> class ScriptMessageClientGtk final : public WebScriptMessageHandler::Client {
> public:
>     ScriptMessageClientGtk(WebKitUserContentManager* manager, const char* handlerName)
>@@ -263,6 +266,7 @@ void webkit_user_content_manager_unregister_script_message_handler(WebKitUserCon
>     g_return_if_fail(name);
>     manager->priv->userContentController->removeUserMessageHandlerForName(String::fromUTF8(name), API::UserContentWorld::normalWorld());
> }
>+#endif
> 
> WebUserContentControllerProxy* webkitUserContentManagerGetUserContentControllerProxy(WebKitUserContentManager* manager)
> {
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>index 8215e222814182f2bd5e7b8c282a8d8b5481a124..529910ffdc8dec3a6bb1857eb11794243a6d46fb 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>@@ -3254,6 +3254,7 @@ WebKitFindController* webkit_web_view_get_find_controller(WebKitWebView* webView
>     return webView->priv->findController.get();
> }
> 
>+#if PLATFORM(GTK)
> /**
>  * webkit_web_view_get_javascript_global_context:
>  * @web_view: a #WebKitWebView
>@@ -3474,6 +3475,7 @@ WebKitJavascriptResult* webkit_web_view_run_javascript_from_gresource_finish(Web
> 
>     return static_cast<WebKitJavascriptResult*>(g_task_propagate_pointer(G_TASK(result), error));
> }
>+#endif
> 
> /**
>  * webkit_web_view_get_main_resource:
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitUserContentManager.h b/Source/WebKit/UIProcess/API/wpe/WebKitUserContentManager.h
>index 27a27c83a4f70e53479b5f74aea587296494ddab..cef8cd41bccf7e1eb5c85edcc7eeead59f89553f 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitUserContentManager.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitUserContentManager.h
>@@ -71,13 +71,6 @@ webkit_user_content_manager_add_style_sheet                   (WebKitUserContent
> WEBKIT_API void
> webkit_user_content_manager_remove_all_style_sheets           (WebKitUserContentManager *manager);
> 
>-WEBKIT_API gboolean
>-webkit_user_content_manager_register_script_message_handler   (WebKitUserContentManager *manager,
>-                                                               const gchar              *name);
>-WEBKIT_API void
>-webkit_user_content_manager_unregister_script_message_handler (WebKitUserContentManager *manager,
>-                                                               const gchar              *name);
>-
> WEBKIT_API void
> webkit_user_content_manager_add_script              (WebKitUserContentManager *manager,
>                                                      WebKitUserScript         *script);
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>index fbb4f809d920f656486e4fa6ec610fdba98c278a..49a98e25c409bf97ffaca697e8a19b8d8813c371 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebView.h
>@@ -28,7 +28,6 @@
> #ifndef WebKitWebView_h
> #define WebKitWebView_h
> 
>-#include <JavaScriptCore/JSBase.h>
> #include <wpe/WebKitAuthenticationRequest.h>
> #include <wpe/WebKitBackForwardList.h>
> #include <wpe/WebKitContextMenu.h>
>@@ -38,7 +37,6 @@
> #include <wpe/WebKitFindController.h>
> #include <wpe/WebKitFormSubmissionRequest.h>
> #include <wpe/WebKitHitTestResult.h>
>-#include <wpe/WebKitJavascriptResult.h>
> #include <wpe/WebKitNavigationAction.h>
> #include <wpe/WebKitNotification.h>
> #include <wpe/WebKitPermissionRequest.h>
>@@ -400,32 +398,6 @@ webkit_web_view_execute_editing_command_with_argument(WebKitWebView
> WEBKIT_API WebKitFindController *
> webkit_web_view_get_find_controller                  (WebKitWebView             *web_view);
> 
>-WEBKIT_API JSGlobalContextRef
>-webkit_web_view_get_javascript_global_context        (WebKitWebView             *web_view);
>-
>-WEBKIT_API void
>-webkit_web_view_run_javascript                       (WebKitWebView             *web_view,
>-                                                      const gchar               *script,
>-                                                      GCancellable              *cancellable,
>-                                                      GAsyncReadyCallback        callback,
>-                                                      gpointer                   user_data);
>-WEBKIT_API WebKitJavascriptResult *
>-webkit_web_view_run_javascript_finish                (WebKitWebView             *web_view,
>-                                                      GAsyncResult              *result,
>-                                                      GError                   **error);
>-
>-WEBKIT_API void
>-webkit_web_view_run_javascript_from_gresource        (WebKitWebView             *web_view,
>-                                                      const gchar               *resource,
>-                                                      GCancellable              *cancellable,
>-                                                      GAsyncReadyCallback        callback,
>-                                                      gpointer                   user_data);
>-
>-WEBKIT_API WebKitJavascriptResult *
>-webkit_web_view_run_javascript_from_gresource_finish (WebKitWebView             *web_view,
>-                                                      GAsyncResult              *result,
>-                                                      GError                   **error);
>-
> WEBKIT_API WebKitWebResource *
> webkit_web_view_get_main_resource                    (WebKitWebView             *web_view);
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/webkit.h b/Source/WebKit/UIProcess/API/wpe/webkit.h
>index 943ade2afa819b9e8cb0b9f7eb41a758a1e3bc1b..e26845203190ecf2645bc07dbb2852c70bc6f311 100644
>--- a/Source/WebKit/UIProcess/API/wpe/webkit.h
>+++ b/Source/WebKit/UIProcess/API/wpe/webkit.h
>@@ -49,7 +49,6 @@
> #include <wpe/WebKitGeolocationPermissionRequest.h>
> #include <wpe/WebKitHitTestResult.h>
> #include <wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h>
>-#include <wpe/WebKitJavascriptResult.h>
> #include <wpe/WebKitMimeInfo.h>
> #include <wpe/WebKitNavigationAction.h>
> #include <wpe/WebKitNavigationPolicyDecision.h>
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp
>index 1953333adaedab22c04a5a01d488fc173ade8a3d..aacda80ebafe4344f7e237d1ad419735f34acce5 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitFrame.cpp
>@@ -90,6 +90,7 @@ const gchar* webkit_frame_get_uri(WebKitFrame* frame)
>     return frame->priv->uri.data();
> }
> 
>+#if PLATFORM(GTK)
> /**
>  * webkit_frame_get_javascript_global_context:
>  * @frame: a #WebKitFrame
>@@ -126,3 +127,4 @@ JSGlobalContextRef webkit_frame_get_javascript_context_for_script_world(WebKitFr
> 
>     return frame->priv->webFrame->jsContextForWorld(webkitScriptWorldGetInjectedBundleScriptWorld(world));
> }
>+#endif
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitFrame.h b/Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitFrame.h
>index 23da0ae4ca479f2460b8887f3a5771662cccf115..950dcd57492b0539a5eb8bf414cb161e74edc204 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitFrame.h
>+++ b/Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitFrame.h
>@@ -24,10 +24,8 @@
> #ifndef WebKitFrame_h
> #define WebKitFrame_h
> 
>-#include <JavaScriptCore/JSBase.h>
> #include <glib-object.h>
> #include <wpe/WebKitDefines.h>
>-#include <wpe/WebKitScriptWorld.h>
> 
> G_BEGIN_DECLS
> 
>@@ -61,13 +59,6 @@ webkit_frame_is_main_frame                           (WebKitFrame       *frame);
> WEBKIT_API const gchar *
> webkit_frame_get_uri                                 (WebKitFrame       *frame);
> 
>-WEBKIT_API JSGlobalContextRef
>-webkit_frame_get_javascript_global_context           (WebKitFrame       *frame);
>-
>-WEBKIT_API JSGlobalContextRef
>-webkit_frame_get_javascript_context_for_script_world (WebKitFrame       *frame,
>-                                                      WebKitScriptWorld *world);
>-
> G_END_DECLS
> 
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 185518: 340105 | 340112