Changeset 196755 in webkit


Ignore:
Timestamp:
Feb 18, 2016 8:12:23 AM (8 years ago)
Author:
Carlos Garcia Campos
Message:

[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:
Location:
trunk/Source/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r196754 r196755  
     12016-02-18  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Use G_TYPE_ERROR instead of G_TYPE_POINTER for GError parameters of signals
     4        https://bugs.webkit.org/show_bug.cgi?id=153786
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        It's binary compatible and it's needed by binding generator to
     9        properly identify those parameters as GError.
     10
     11        * UIProcess/API/gtk/WebKitDownload.cpp:
     12        (webkit_download_class_init):
     13        * UIProcess/API/gtk/WebKitPrintOperation.cpp:
     14        (webkit_print_operation_class_init):
     15        * UIProcess/API/gtk/WebKitWebResource.cpp:
     16        (webkit_web_resource_class_init):
     17        * UIProcess/API/gtk/WebKitWebView.cpp:
     18        (webkit_web_view_class_init):
     19        * UIProcess/API/gtk/webkit2marshal.list:
     20
    1212016-02-18  Ryuan Choi  <ryuan.choi@navercorp.com>
    222
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

    r185502 r196755  
    263263     */
    264264    signals[FAILED] =
    265         g_signal_new("failed",
    266                      G_TYPE_FROM_CLASS(objectClass),
    267                      G_SIGNAL_RUN_LAST,
    268                      0, 0, 0,
    269                      g_cclosure_marshal_VOID__POINTER,
    270                      G_TYPE_NONE, 1,
    271                      G_TYPE_POINTER);
     265        g_signal_new(
     266            "failed",
     267            G_TYPE_FROM_CLASS(objectClass),
     268            G_SIGNAL_RUN_LAST,
     269            0, 0, 0,
     270            g_cclosure_marshal_VOID__BOXED,
     271            G_TYPE_NONE, 1,
     272            G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
    272273
    273274    /**
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp

    r185502 r196755  
    199199     */
    200200    signals[FAILED] =
    201         g_signal_new("failed",
    202                      G_TYPE_FROM_CLASS(gObjectClass),
    203                      G_SIGNAL_RUN_LAST,
    204                      0, 0, 0,
    205                      g_cclosure_marshal_VOID__POINTER,
    206                      G_TYPE_NONE, 1,
    207                      G_TYPE_POINTER);
     201        g_signal_new(
     202            "failed",
     203            G_TYPE_FROM_CLASS(gObjectClass),
     204            G_SIGNAL_RUN_LAST,
     205            0, 0, 0,
     206            g_cclosure_marshal_VOID__BOXED,
     207            G_TYPE_NONE, 1,
     208            G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
    208209}
    209210
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp

    r185502 r196755  
    192192     */
    193193    signals[FAILED] =
    194         g_signal_new("failed",
    195                      G_TYPE_FROM_CLASS(objectClass),
    196                      G_SIGNAL_RUN_LAST,
    197                      0, 0, 0,
    198                      g_cclosure_marshal_VOID__POINTER,
    199                      G_TYPE_NONE, 1,
    200                      G_TYPE_POINTER);
     194        g_signal_new(
     195            "failed",
     196            G_TYPE_FROM_CLASS(objectClass),
     197            G_SIGNAL_RUN_LAST,
     198            0, 0, 0,
     199            g_cclosure_marshal_VOID__BOXED,
     200            G_TYPE_NONE, 1,
     201            G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
    201202
    202203    /**
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r194890 r196755  
    10761076     */
    10771077    signals[LOAD_FAILED] =
    1078         g_signal_new("load-failed",
    1079                      G_TYPE_FROM_CLASS(webViewClass),
    1080                      G_SIGNAL_RUN_LAST,
    1081                      G_STRUCT_OFFSET(WebKitWebViewClass, load_failed),
    1082                      g_signal_accumulator_true_handled, 0,
    1083                      webkit_marshal_BOOLEAN__ENUM_STRING_POINTER,
    1084                      G_TYPE_BOOLEAN, 3,
    1085                      WEBKIT_TYPE_LOAD_EVENT,
    1086                      G_TYPE_STRING,
    1087                      G_TYPE_POINTER);
     1078        g_signal_new(
     1079            "load-failed",
     1080            G_TYPE_FROM_CLASS(webViewClass),
     1081            G_SIGNAL_RUN_LAST,
     1082            G_STRUCT_OFFSET(WebKitWebViewClass, load_failed),
     1083            g_signal_accumulator_true_handled, 0,
     1084            g_cclosure_marshal_generic,
     1085            G_TYPE_BOOLEAN, 3,
     1086            WEBKIT_TYPE_LOAD_EVENT,
     1087            G_TYPE_STRING,
     1088            G_TYPE_ERROR | G_SIGNAL_TYPE_STATIC_SCOPE);
    10881089
    10891090    /**
  • trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list

    r157781 r196755  
    11BOOLEAN:BOXED
    22BOOLEAN:BOXED,STRING
    3 BOOLEAN:ENUM,STRING,POINTER
    43BOOLEAN:OBJECT
    54BOOLEAN:OBJECT,BOXED,OBJECT
Note: See TracChangeset for help on using the changeset viewer.