<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161805] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161805">161805</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-12 00:45:48 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161804 => 161805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-12 08:45:48 UTC (rev 161805)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Fix return value of WebKitDownload::created-destination
+ https://bugs.webkit.org/show_bug.cgi?id=126741
+
+ Reviewed by Martin Robinson.
+
+ 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):
+
</ins><span class="cx"> 2014-01-11 Yongjun Zhang <yongjun_zhang@apple.com>
</span><span class="cx">
</span><span class="cx"> Support bool argument for encoding/decoding invocations.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (161804 => 161805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-12 08:45:48 UTC (rev 161805)
</span><span class="lines">@@ -264,13 +264,14 @@
</span><span class="cx"> * created successfully at @destination.
</span><span class="cx"> */
</span><span class="cx"> signals[CREATED_DESTINATION] =
</span><del>- g_signal_new("created-destination",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_BOOLEAN, 1,
- G_TYPE_STRING);
</del><ins>+ g_signal_new(
+ "created-destination",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, 0, 0,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitDownload* webkitDownloadCreate(DownloadProxy* downloadProxy)
</span><span class="lines">@@ -382,8 +383,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (download->priv->isCancelled)
</span><span class="cx"> return;
</span><del>- gboolean returnValue;
- g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), &returnValue);
</del><ins>+ g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161804 => 161805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Tools/ChangeLog 2014-01-12 08:45:48 UTC (rev 161805)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Fix return value of WebKitDownload::created-destination
+ https://bugs.webkit.org/show_bug.cgi?id=126741
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Fix return
+ value of several callbacks.
+
</ins><span class="cx"> 2014-01-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add support for null StringViews
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp (161804 => 161805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-12 08:45:48 UTC (rev 161805)
</span><span class="lines">@@ -52,31 +52,27 @@
</span><span class="cx"> test->receivedResponse(download);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static gboolean createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
</del><ins>+ static void createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
</ins><span class="cx"> {
</span><span class="cx"> g_assert(webkit_download_get_destination(download));
</span><span class="cx"> g_assert_cmpstr(webkit_download_get_destination(download), ==, destination);
</span><span class="cx"> test->createdDestination(download, destination);
</span><del>- return TRUE;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- static gboolean receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
</del><ins>+ static void receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
</ins><span class="cx"> {
</span><span class="cx"> test->receivedData(download, dataLength);
</span><del>- return TRUE;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- static gboolean finishedCallback(WebKitDownload* download, DownloadTest* test)
</del><ins>+ static void finishedCallback(WebKitDownload* download, DownloadTest* test)
</ins><span class="cx"> {
</span><span class="cx"> test->finished(download);
</span><del>- return TRUE;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- static gboolean failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
</del><ins>+ static void failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
</ins><span class="cx"> {
</span><span class="cx"> g_assert(error);
</span><span class="cx"> test->failed(download, error);
</span><del>- return TRUE;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean decideDestinationCallback(WebKitDownload* download, const gchar* suggestedFilename, DownloadTest* test)
</span></span></pre>
</div>
</div>
</body>
</html>