Diff
Modified: trunk/Source/WebKit2/ChangeLog (196754 => 196755)
--- trunk/Source/WebKit2/ChangeLog 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-18 16:12:23 UTC (rev 196755)
@@ -1,3 +1,23 @@
+2016-02-18 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use G_TYPE_ERROR instead of G_TYPE_POINTER for GError parameters of signals
+ https://bugs.webkit.org/show_bug.cgi?id=153786
+
+ Reviewed by Michael Catanzaro.
+
+ It's binary compatible and it's needed by binding generator to
+ properly identify those parameters as GError.
+
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ (webkit_download_class_init):
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ (webkit_print_operation_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:
+
2016-02-18 Ryuan Choi <[email protected]>
[EFL] Move WebView from CoordinatedGraphics to efl
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (196754 => 196755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2016-02-18 16:12:23 UTC (rev 196755)
@@ -262,13 +262,14 @@
* after an error and #WebKitDownload::finished signal is emitted after this one.
*/
signals[FAILED] =
- g_signal_new("failed",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ g_signal_new(
+ "failed",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, 0, 0,
+ g_cclosure_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1,
+ G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
* WebKitDownload::decide-destination:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (196754 => 196755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2016-02-18 16:12:23 UTC (rev 196755)
@@ -198,13 +198,14 @@
* The #WebKitPrintOperation::finished signal is emitted after this one.
*/
signals[FAILED] =
- g_signal_new("failed",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ g_signal_new(
+ "failed",
+ G_TYPE_FROM_CLASS(gObjectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, 0, 0,
+ g_cclosure_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1,
+ G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
}
#if HAVE(GTK_UNIX_PRINTING)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (196754 => 196755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2016-02-18 16:12:23 UTC (rev 196755)
@@ -191,13 +191,14 @@
* load operation.
*/
signals[FAILED] =
- g_signal_new("failed",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ g_signal_new(
+ "failed",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, 0, 0,
+ g_cclosure_marshal_VOID__BOXED,
+ G_TYPE_NONE, 1,
+ G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
* WebKitWebResource::failed-with-tls-errors:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (196754 => 196755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2016-02-18 16:12:23 UTC (rev 196755)
@@ -1075,16 +1075,17 @@
* %FALSE to propagate the event further.
*/
signals[LOAD_FAILED] =
- g_signal_new("load-failed",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(WebKitWebViewClass, load_failed),
- g_signal_accumulator_true_handled, 0,
- webkit_marshal_BOOLEAN__ENUM_STRING_POINTER,
- G_TYPE_BOOLEAN, 3,
- WEBKIT_TYPE_LOAD_EVENT,
- G_TYPE_STRING,
- G_TYPE_POINTER);
+ g_signal_new(
+ "load-failed",
+ G_TYPE_FROM_CLASS(webViewClass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(WebKitWebViewClass, load_failed),
+ g_signal_accumulator_true_handled, 0,
+ g_cclosure_marshal_generic,
+ G_TYPE_BOOLEAN, 3,
+ WEBKIT_TYPE_LOAD_EVENT,
+ G_TYPE_STRING,
+ G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
* WebKitWebView::load-failed-with-tls-errors:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list (196754 => 196755)
--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list 2016-02-18 11:31:20 UTC (rev 196754)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list 2016-02-18 16:12:23 UTC (rev 196755)
@@ -1,6 +1,5 @@
BOOLEAN:BOXED
BOOLEAN:BOXED,STRING
-BOOLEAN:ENUM,STRING,POINTER
BOOLEAN:OBJECT
BOOLEAN:OBJECT,BOXED,OBJECT
BOOLEAN:OBJECT,ENUM
