<!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>[161177] trunk/Source/WebCore</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/161177">161177</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-31 00:30:26 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Implement ResourceHandle::continueWillSendRequest()
https://bugs.webkit.org/show_bug.cgi?id=126291
Reviewed by Martin Robinson.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::continueAfterWillSendRequest): Helper function that
continues with the load after willSendRequest has been called.
(WebCore::doRedirect): Call continueAfterWillSendRequest() when
client doesn't use async callbacks.
(WebCore::ResourceHandle::continueWillSendRequest): Call
continueAfterWillSendRequest().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161176 => 161177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-31 08:28:17 UTC (rev 161176)
+++ trunk/Source/WebCore/ChangeLog 2013-12-31 08:30:26 UTC (rev 161177)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Implement ResourceHandle::continueWillSendRequest()
+ https://bugs.webkit.org/show_bug.cgi?id=126291
+
+ Reviewed by Martin Robinson.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::continueAfterWillSendRequest): Helper function that
+ continues with the load after willSendRequest has been called.
+ (WebCore::doRedirect): Call continueAfterWillSendRequest() when
+ client doesn't use async callbacks.
+ (WebCore::ResourceHandle::continueWillSendRequest): Call
+ continueAfterWillSendRequest().
+
</ins><span class="cx"> 2013-12-30 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] willSendRequest doesn't work after a redirect
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (161176 => 161177)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-31 08:28:17 UTC (rev 161176)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2013-12-31 08:30:26 UTC (rev 161177)
</span><span class="lines">@@ -455,6 +455,20 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void continueAfterWillSendRequest(ResourceHandle* handle, const ResourceRequest& newRequest)
+{
+ // willSendRequest might cancel the load.
+ if (handle->cancelledOrClientless())
+ return;
+
+ if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
+ handle->getInternal()->client()->cannotShowURL(handle);
+ return;
+ }
+
+ handle->sendPendingRequest();
+}
+
</ins><span class="cx"> static void doRedirect(ResourceHandle* handle)
</span><span class="cx"> {
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="lines">@@ -506,23 +520,15 @@
</span><span class="cx"> // the WebKit layer. They were only placed in the URL for the benefit of libsoup.
</span><span class="cx"> newRequest.removeCredentials();
</span><span class="cx">
</span><ins>+ cleanupSoupRequestOperation(handle);
+
</ins><span class="cx"> if (d->client()->usesAsyncCallbacks())
</span><span class="cx"> d->client()->willSendRequestAsync(handle, newRequest, d->m_response);
</span><del>- else
</del><ins>+ else {
</ins><span class="cx"> d->client()->willSendRequest(handle, newRequest, d->m_response);
</span><del>-
- cleanupSoupRequestOperation(handle);
-
- // willSendRequest might cancel the load.
- if (handle->cancelledOrClientless())
- return;
-
- if (!createSoupRequestAndMessageForHandle(handle, newRequest, true)) {
- d->client()->cannotShowURL(handle);
- return;
</del><ins>+ continueAfterWillSendRequest(handle, newRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- handle->sendPendingRequest();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void redirectSkipCallback(GObject*, GAsyncResult* asyncResult, gpointer data)
</span><span class="lines">@@ -1392,7 +1398,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(client());
</span><span class="cx"> ASSERT(client()->usesAsyncCallbacks());
</span><del>- // FIXME: Implement this method if needed: https://bugs.webkit.org/show_bug.cgi?id=126114.
</del><ins>+ continueAfterWillSendRequest(this, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::continueDidReceiveResponse()
</span></span></pre>
</div>
</div>
</body>
</html>