Diff
Modified: trunk/Source/WebKit2/ChangeLog (217959 => 217960)
--- trunk/Source/WebKit2/ChangeLog 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-09 05:22:40 UTC (rev 217960)
@@ -1,3 +1,29 @@
+2017-06-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Get rid of custom marshallers of signals
+ https://bugs.webkit.org/show_bug.cgi?id=173094
+
+ Reviewed by Žan Doberšek.
+
+ Use g_cclosure_marshal_generic instead.
+
+ * PlatformGTK.cmake:
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ (webkit_download_class_init):
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ (webkit_favicon_database_class_init):
+ * UIProcess/API/gtk/WebKitWebInspector.cpp:
+ (webkit_web_inspector_class_init):
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ (webkit_web_resource_class_init):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_class_init):
+ * UIProcess/API/gtk/webkit2marshal.list: Removed.
+ * WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (webkit_web_page_class_init):
+
2017-06-08 Simon Fraser <[email protected]>
Crash under -[WKWebView _updateVisibleContentRects]
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (217959 => 217960)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-06-09 05:22:40 UTC (rev 217960)
@@ -524,7 +524,6 @@
${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
)
if (ENABLE_WAYLAND_TARGET)
@@ -982,19 +981,6 @@
ADD_WHOLE_ARCHIVE_TO_LIBRARIES(WebKit2_LIBRARIES)
-set(WebKit2_MARSHAL_LIST ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2marshal.list)
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.h
- MAIN_DEPENDENCY ${WebKit2_MARSHAL_LIST}
-
- COMMAND echo extern \"C\" { > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
- COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --body >> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
- COMMAND echo } >> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
-
- COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --header > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.h
- VERBATIM)
-
# To generate WebKitEnumTypes.h we want to use all installed headers, except WebKitEnumTypes.h itself.
set(WebKit2GTK_ENUM_GENERATION_HEADERS ${WebKit2GTK_INSTALLED_HEADERS})
list(REMOVE_ITEM WebKit2GTK_ENUM_GENERATION_HEADERS ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -22,7 +22,6 @@
#include "APIArray.h"
#include "WebKitBackForwardListPrivate.h"
-#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
#include <wtf/glib/GRefPtr.h>
@@ -80,15 +79,15 @@
* %NULL when only the current item is updated. Items are only removed
* when the list is cleared or the maximum items limit is reached.
*/
- signals[CHANGED] =
- g_signal_new("changed",
- G_TYPE_FROM_CLASS(listClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__OBJECT_POINTER,
- G_TYPE_NONE, 2,
- WEBKIT_TYPE_BACK_FORWARD_LIST_ITEM,
- G_TYPE_POINTER);
+ signals[CHANGED] = g_signal_new(
+ "changed",
+ G_TYPE_FROM_CLASS(listClass),
+ G_SIGNAL_RUN_LAST,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2,
+ WEBKIT_TYPE_BACK_FORWARD_LIST_ITEM,
+ G_TYPE_POINTER);
}
static WebKitBackForwardListItem* webkitBackForwardListGetOrCreateItem(WebKitBackForwardList* list, WebBackForwardListItem* webListItem)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -23,7 +23,6 @@
#include "DownloadProxy.h"
#include "WebErrors.h"
#include "WebKitDownloadPrivate.h"
-#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
#include "WebKitURIRequestPrivate.h"
#include "WebKitURIResponsePrivate.h"
@@ -225,14 +224,14 @@
* every time new data has been written to the destination. It's
* useful to know the progress of the download operation.
*/
- signals[RECEIVED_DATA] =
- g_signal_new("received-data",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__UINT64,
- G_TYPE_NONE, 1,
- G_TYPE_UINT64);
+ signals[RECEIVED_DATA] = g_signal_new(
+ "received-data",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 1,
+ G_TYPE_UINT64);
/**
* WebKitDownload::finished:
@@ -284,15 +283,15 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[DECIDE_DESTINATION] =
- g_signal_new("decide-destination",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitDownloadClass, decide_destination),
- g_signal_accumulator_true_handled, NULL,
- webkit_marshal_BOOLEAN__STRING,
- G_TYPE_BOOLEAN, 1,
- G_TYPE_STRING);
+ signals[DECIDE_DESTINATION] = g_signal_new(
+ "decide-destination",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitDownloadClass, decide_destination),
+ g_signal_accumulator_true_handled, NULL,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1,
+ G_TYPE_STRING);
/**
* WebKitDownload::created-destination:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -21,7 +21,6 @@
#include "WebKitFaviconDatabase.h"
#include "WebKitFaviconDatabasePrivate.h"
-#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
#include <WebCore/FileSystem.h>
#include <WebCore/Image.h>
@@ -104,16 +103,15 @@
* #WebKitWebView it's easier to use the #WebKitWebView:favicon
* property. See webkit_web_view_get_favicon() for more details.
*/
- signals[FAVICON_CHANGED] =
- g_signal_new(
- "favicon-changed",
- G_TYPE_FROM_CLASS(faviconDatabaseClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__STRING_STRING,
- G_TYPE_NONE, 2,
- G_TYPE_STRING,
- G_TYPE_STRING);
+ signals[FAVICON_CHANGED] = g_signal_new(
+ "favicon-changed",
+ G_TYPE_FROM_CLASS(faviconDatabaseClass),
+ G_SIGNAL_RUN_LAST,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2,
+ G_TYPE_STRING,
+ G_TYPE_STRING);
}
struct GetFaviconSurfaceAsyncData {
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -21,7 +21,6 @@
#include "WebKitWebInspector.h"
#include "WebInspectorProxy.h"
-#include "WebKitMarshal.h"
#include "WebKitWebInspectorPrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
@@ -176,14 +175,14 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[OPEN_WINDOW] =
- g_signal_new("open-window",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[OPEN_WINDOW] = g_signal_new(
+ "open-window",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
/**
* WebKitWebInspector::bring-to-front:
@@ -204,14 +203,14 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[BRING_TO_FRONT] =
- g_signal_new("bring-to-front",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[BRING_TO_FRONT] = g_signal_new(
+ "bring-to-front",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
/**
* WebKitWebInspector::closed:
@@ -246,14 +245,14 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[ATTACH] =
- g_signal_new("attach",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[ATTACH] = g_signal_new(
+ "attach",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
/**
* WebKitWebInspector::detach:
@@ -272,14 +271,14 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[DETACH] =
- g_signal_new("detach",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[DETACH] = g_signal_new(
+ "detach",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
}
static bool openWindow(WKInspectorRef, const void* clientInfo)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -22,7 +22,6 @@
#include "APIData.h"
#include "WebFrameProxy.h"
-#include "WebKitMarshal.h"
#include "WebKitURIRequest.h"
#include "WebKitWebResourcePrivate.h"
#include <glib/gi18n-lib.h>
@@ -138,15 +137,15 @@
* @redirected_response parameter containing the response
* received by the server for the initial request.
*/
- signals[SENT_REQUEST] =
- g_signal_new("sent-request",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__OBJECT_OBJECT,
- G_TYPE_NONE, 2,
- WEBKIT_TYPE_URI_REQUEST,
- WEBKIT_TYPE_URI_RESPONSE);
+ signals[SENT_REQUEST] = g_signal_new(
+ "sent-request",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2,
+ WEBKIT_TYPE_URI_REQUEST,
+ WEBKIT_TYPE_URI_RESPONSE);
/**
* WebKitWebResource::received-data:
@@ -157,14 +156,14 @@
* every time new data has been received. It's
* useful to know the progress of the resource load operation.
*/
- signals[RECEIVED_DATA] =
- g_signal_new("received-data",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__UINT64,
- G_TYPE_NONE, 1,
- G_TYPE_UINT64);
+ signals[RECEIVED_DATA] = g_signal_new(
+ "received-data",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 1,
+ G_TYPE_UINT64);
/**
* WebKitWebResource::finished:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -45,7 +45,6 @@
#include "WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h"
#include "WebKitJavascriptResultPrivate.h"
#include "WebKitLoaderClient.h"
-#include "WebKitMarshal.h"
#include "WebKitNotificationPrivate.h"
#include "WebKitPolicyClient.h"
#include "WebKitPrintOperationPrivate.h"
@@ -1346,15 +1345,15 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[SCRIPT_DIALOG] =
- g_signal_new("script-dialog",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, script_dialog),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__BOXED,
- G_TYPE_BOOLEAN, 1,
- WEBKIT_TYPE_SCRIPT_DIALOG | G_SIGNAL_TYPE_STATIC_SCOPE);
+ signals[SCRIPT_DIALOG] = g_signal_new(
+ "script-dialog",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, script_dialog),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1,
+ WEBKIT_TYPE_SCRIPT_DIALOG | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
* WebKitWebView::decide-policy:
@@ -1406,16 +1405,16 @@
* %FALSE to propagate the event further.
*
*/
- signals[DECIDE_POLICY] =
- g_signal_new("decide-policy",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, decide_policy),
- g_signal_accumulator_true_handled, 0 /* accumulator data */,
- webkit_marshal_BOOLEAN__OBJECT_ENUM,
- G_TYPE_BOOLEAN, 2, /* number of parameters */
- WEBKIT_TYPE_POLICY_DECISION,
- WEBKIT_TYPE_POLICY_DECISION_TYPE);
+ signals[DECIDE_POLICY] = g_signal_new(
+ "decide-policy",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, decide_policy),
+ g_signal_accumulator_true_handled, nullptr /* accumulator data */,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 2, /* number of parameters */
+ WEBKIT_TYPE_POLICY_DECISION,
+ WEBKIT_TYPE_POLICY_DECISION_TYPE);
/**
* WebKitWebView::permission-request:
@@ -1473,15 +1472,15 @@
* %FALSE to propagate the event further.
*
*/
- signals[PERMISSION_REQUEST] =
- g_signal_new("permission-request",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, permission_request),
- g_signal_accumulator_true_handled, 0 /* accumulator data */,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1, /* number of parameters */
- WEBKIT_TYPE_PERMISSION_REQUEST);
+ signals[PERMISSION_REQUEST] = g_signal_new(
+ "permission-request",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, permission_request),
+ g_signal_accumulator_true_handled, nullptr /* accumulator data */,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1, /* number of parameters */
+ WEBKIT_TYPE_PERMISSION_REQUEST);
/**
* WebKitWebView::mouse-target-changed:
* @web_view: the #WebKitWebView on which the signal is emitted
@@ -1497,16 +1496,17 @@
* The signal is emitted again when the mouse is moved out of the
* current element with a new @hit_test_result.
*/
- signals[MOUSE_TARGET_CHANGED] =
- g_signal_new("mouse-target-changed",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, mouse_target_changed),
- 0, 0,
- webkit_marshal_VOID__OBJECT_UINT,
- G_TYPE_NONE, 2,
- WEBKIT_TYPE_HIT_TEST_RESULT,
- G_TYPE_UINT);
+ signals[MOUSE_TARGET_CHANGED] = g_signal_new(
+ "mouse-target-changed",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, mouse_target_changed),
+ nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2,
+ WEBKIT_TYPE_HIT_TEST_RESULT,
+ G_TYPE_UINT);
+
/**
* WebKitWebView::print:
* @web_view: the #WebKitWebView on which the signal is emitted
@@ -1525,15 +1525,15 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[PRINT] =
- g_signal_new("print",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, print),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1,
- WEBKIT_TYPE_PRINT_OPERATION);
+ signals[PRINT] = g_signal_new(
+ "print",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, print),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1,
+ WEBKIT_TYPE_PRINT_OPERATION);
/**
* WebKitWebView::resource-load-started:
@@ -1546,15 +1546,15 @@
* You can monitor the load operation by connecting to the different signals
* of @resource.
*/
- signals[RESOURCE_LOAD_STARTED] =
- g_signal_new("resource-load-started",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, resource_load_started),
- 0, 0,
- webkit_marshal_VOID__OBJECT_OBJECT,
- G_TYPE_NONE, 2,
- WEBKIT_TYPE_WEB_RESOURCE,
+ signals[RESOURCE_LOAD_STARTED] = g_signal_new(
+ "resource-load-started",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, resource_load_started),
+ nullptr, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_NONE, 2,
+ WEBKIT_TYPE_WEB_RESOURCE,
WEBKIT_TYPE_URI_REQUEST);
/**
@@ -1573,14 +1573,14 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to continue emission of the event.
*/
- signals[ENTER_FULLSCREEN] =
- g_signal_new("enter-fullscreen",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, enter_fullscreen),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[ENTER_FULLSCREEN] = g_signal_new(
+ "enter-fullscreen",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, enter_fullscreen),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
/**
* WebKitWebView::leave-fullscreen:
@@ -1594,14 +1594,15 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to continue emission of the event.
*/
- signals[LEAVE_FULLSCREEN] =
- g_signal_new("leave-fullscreen",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, leave_fullscreen),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ signals[LEAVE_FULLSCREEN] = g_signal_new(
+ "leave-fullscreen",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, leave_fullscreen),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 0);
+
/**
* WebKitWebView::run-file-chooser:
* @web_view: the #WebKitWebView on which the signal is emitted
@@ -1623,15 +1624,15 @@
* %FALSE to propagate the event further.
*
*/
- signals[RUN_FILE_CHOOSER] =
- g_signal_new("run-file-chooser",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, run_file_chooser),
- g_signal_accumulator_true_handled, 0 /* accumulator data */,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1, /* number of parameters */
- WEBKIT_TYPE_FILE_CHOOSER_REQUEST);
+ signals[RUN_FILE_CHOOSER] = g_signal_new(
+ "run-file-chooser",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, run_file_chooser),
+ g_signal_accumulator_true_handled, nullptr /* accumulator data */,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1, /* number of parameters */
+ WEBKIT_TYPE_FILE_CHOOSER_REQUEST);
/**
* WebKitWebView::context-menu:
@@ -1693,17 +1694,17 @@
* Returns: %TRUE to stop other handlers from being invoked for the event.
* %FALSE to propagate the event further.
*/
- signals[CONTEXT_MENU] =
- g_signal_new("context-menu",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, context_menu),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__OBJECT_BOXED_OBJECT,
- G_TYPE_BOOLEAN, 3,
- WEBKIT_TYPE_CONTEXT_MENU,
- GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
- WEBKIT_TYPE_HIT_TEST_RESULT);
+ signals[CONTEXT_MENU] = g_signal_new(
+ "context-menu",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, context_menu),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 3,
+ WEBKIT_TYPE_CONTEXT_MENU,
+ GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE,
+ WEBKIT_TYPE_HIT_TEST_RESULT);
/**
* WebKitWebView::context-menu-dismissed:
@@ -1786,9 +1787,8 @@
G_TYPE_FROM_CLASS(webViewClass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(WebKitWebViewClass, web_process_crashed),
- g_signal_accumulator_true_handled,
- 0,
- webkit_marshal_BOOLEAN__VOID,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 0);
/**
@@ -1814,15 +1814,15 @@
*
* Since: 2.2
*/
- signals[AUTHENTICATE] =
- g_signal_new("authenticate",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, authenticate),
- g_signal_accumulator_true_handled, 0 /* accumulator data */,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1, /* number of parameters */
- WEBKIT_TYPE_AUTHENTICATION_REQUEST);
+ signals[AUTHENTICATE] = g_signal_new(
+ "authenticate",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, authenticate),
+ g_signal_accumulator_true_handled, nullptr /* accumulator data */,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1, /* number of parameters */
+ WEBKIT_TYPE_AUTHENTICATION_REQUEST);
/**
* WebKitWebView::show-notification:
@@ -1840,15 +1840,15 @@
*
* Since: 2.8
*/
- signals[SHOW_NOTIFICATION] =
- g_signal_new("show-notification",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, show_notification),
- g_signal_accumulator_true_handled, nullptr /* accumulator data */,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1,
- WEBKIT_TYPE_NOTIFICATION);
+ signals[SHOW_NOTIFICATION] = g_signal_new(
+ "show-notification",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, show_notification),
+ g_signal_accumulator_true_handled, nullptr /* accumulator data */,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1,
+ WEBKIT_TYPE_NOTIFICATION);
/**
* WebKitWebView::run-color-chooser:
@@ -1874,15 +1874,15 @@
*
* Since: 2.8
*/
- signals[RUN_COLOR_CHOOSER] =
- g_signal_new("run-color-chooser",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, run_color_chooser),
- g_signal_accumulator_true_handled, nullptr,
- webkit_marshal_BOOLEAN__OBJECT,
- G_TYPE_BOOLEAN, 1,
- WEBKIT_TYPE_COLOR_CHOOSER_REQUEST);
+ signals[RUN_COLOR_CHOOSER] = g_signal_new(
+ "run-color-chooser",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, run_color_chooser),
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 1,
+ WEBKIT_TYPE_COLOR_CHOOSER_REQUEST);
}
static void webkitWebViewCancelAuthenticationRequest(WebKitWebView* webView)
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list (217959 => 217960)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list 2017-06-09 05:22:40 UTC (rev 217960)
@@ -1,15 +0,0 @@
-BOOLEAN:BOXED
-BOOLEAN:BOXED,STRING
-BOOLEAN:OBJECT
-BOOLEAN:OBJECT,BOXED,OBJECT
-BOOLEAN:OBJECT,ENUM
-BOOLEAN:OBJECT,OBJECT
-BOOLEAN:STRING
-BOOLEAN:VOID
-OBJECT:VOID
-VOID:OBJECT,UINT
-VOID:OBJECT,OBJECT
-VOID:OBJECT,POINTER
-VOID:STRING,STRING
-VOID:UINT64
-
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp (217959 => 217960)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -20,7 +20,6 @@
#include "config.h"
#include "WebKitScriptWorld.h"
-#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
#include "WebKitScriptWorldPrivate.h"
#include <wtf/HashMap.h>
@@ -77,8 +76,8 @@
"window-object-cleared",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- webkit_marshal_VOID__OBJECT_OBJECT,
+ 0, nullptr, nullptr,
+ g_cclosure_marshal_generic,
G_TYPE_NONE, 2,
WEBKIT_TYPE_WEB_PAGE,
WEBKIT_TYPE_FRAME);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (217959 => 217960)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2017-06-09 02:59:41 UTC (rev 217959)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2017-06-09 05:22:40 UTC (rev 217960)
@@ -33,7 +33,6 @@
#include "WebKitDOMDocumentPrivate.h"
#include "WebKitDOMElementPrivate.h"
#include "WebKitFramePrivate.h"
-#include "WebKitMarshal.h"
#include "WebKitPrivate.h"
#include "WebKitScriptWorldPrivate.h"
#include "WebKitURIRequestPrivate.h"
@@ -441,8 +440,8 @@
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__OBJECT_OBJECT,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 2,
WEBKIT_TYPE_URI_REQUEST,
WEBKIT_TYPE_URI_RESPONSE);
@@ -471,8 +470,8 @@
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
0,
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__OBJECT_OBJECT,
+ g_signal_accumulator_true_handled, nullptr,
+ g_cclosure_marshal_generic,
G_TYPE_BOOLEAN, 2,
WEBKIT_TYPE_CONTEXT_MENU,
WEBKIT_TYPE_WEB_HIT_TEST_RESULT);
