Changeset 161805 in webkit


Ignore:
Timestamp:
Jan 12, 2014 12:45:48 AM (10 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Fix return value of WebKitDownload::created-destination
https://bugs.webkit.org/show_bug.cgi?id=126741

Reviewed by Martin Robinson.

Source/WebKit2:

WebKitDownload::created-destination signal should be void instead
of gboolean. This doesn't break the API/ABI.

  • UIProcess/API/gtk/WebKitDownload.cpp:

(webkit_download_class_init):
(webkitDownloadDestinationCreated):

Tools:

  • TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Fix return

value of several callbacks.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r161804 r161805  
     12014-01-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Fix return value of WebKitDownload::created-destination
     4        https://bugs.webkit.org/show_bug.cgi?id=126741
     5
     6        Reviewed by Martin Robinson.
     7
     8        WebKitDownload::created-destination signal should be void instead
     9        of gboolean. This doesn't break the API/ABI.
     10
     11        * UIProcess/API/gtk/WebKitDownload.cpp:
     12        (webkit_download_class_init):
     13        (webkitDownloadDestinationCreated):
     14
    1152014-01-11  Yongjun Zhang  <yongjun_zhang@apple.com>
    216
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

    r152155 r161805  
    265265     */
    266266    signals[CREATED_DESTINATION] =
    267         g_signal_new("created-destination",
    268                      G_TYPE_FROM_CLASS(objectClass),
    269                      G_SIGNAL_RUN_LAST,
    270                      0, 0, 0,
    271                      g_cclosure_marshal_VOID__STRING,
    272                      G_TYPE_BOOLEAN, 1,
    273                      G_TYPE_STRING);
     267        g_signal_new(
     268            "created-destination",
     269            G_TYPE_FROM_CLASS(objectClass),
     270            G_SIGNAL_RUN_LAST,
     271            0, 0, 0,
     272            g_cclosure_marshal_VOID__STRING,
     273            G_TYPE_NONE, 1,
     274            G_TYPE_STRING);
    274275}
    275276
     
    383384    if (download->priv->isCancelled)
    384385        return;
    385     gboolean returnValue;
    386     g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), &returnValue);
     386    g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), nullptr);
    387387}
    388388
  • trunk/Tools/ChangeLog

    r161785 r161805  
     12014-01-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Fix return value of WebKitDownload::created-destination
     4        https://bugs.webkit.org/show_bug.cgi?id=126741
     5
     6        Reviewed by Martin Robinson.
     7
     8        * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Fix return
     9        value of several callbacks.
     10
    1112014-01-11  Sam Weinig  <sam@webkit.org>
    212
  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp

    r161555 r161805  
    5353    }
    5454
    55     static gboolean createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
     55    static void createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
    5656    {
    5757        g_assert(webkit_download_get_destination(download));
    5858        g_assert_cmpstr(webkit_download_get_destination(download), ==, destination);
    5959        test->createdDestination(download, destination);
    60         return TRUE;
    61     }
    62 
    63     static gboolean receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
     60    }
     61
     62    static void receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
    6463    {
    6564        test->receivedData(download, dataLength);
    66         return TRUE;
    67     }
    68 
    69     static gboolean finishedCallback(WebKitDownload* download, DownloadTest* test)
     65    }
     66
     67    static void finishedCallback(WebKitDownload* download, DownloadTest* test)
    7068    {
    7169        test->finished(download);
    72         return TRUE;
    73     }
    74 
    75     static gboolean failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
     70    }
     71
     72    static void failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
    7673    {
    7774        g_assert(error);
    7875        test->failed(download, error);
    79         return TRUE;
    8076    }
    8177
Note: See TracChangeset for help on using the changeset viewer.