<!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>[196428] trunk/Source/WebKit2</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/196428">196428</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-02-11 11:49:38 -0800 (Thu, 11 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use BlobResourceHandle when loading blob urls, even when using NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=154096
Reviewed by Brady Eidson.
This fixes at least http/tests/xmlhttprequest/blob-request-byte-range.html.
* NetworkProcess/NetworkDataTask.h:
Renamed NetworkDataTaskClient::didReceiveResponse to didReceiveResponseNetworkSession
to avoid conflicting with ResourceHandleClient::didReceiveResponse.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::NetworkLoad):
Make a BlobResourceHandle instead of a NetworkDataTask if we have a request for a blob url.
(WebKit::NetworkLoad::~NetworkLoad):
(WebKit::NetworkLoad::setDefersLoading):
(WebKit::NetworkLoad::cancel):
(WebKit::NetworkLoad::continueWillSendRequest):
(WebKit::NetworkLoad::continueDidReceiveResponse):
(WebKit::NetworkLoad::sharedDidReceiveResponse):
(WebKit::NetworkLoad::convertTaskToDownload):
(WebKit::NetworkLoad::setPendingDownloadID):
(WebKit::NetworkLoad::didReceiveChallenge):
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):
(WebKit::NetworkLoad::cannotShowURL):
(WebKit::NetworkLoad::didReceiveResponseAsync):
(WebKit::NetworkLoad::willSendRequestAsync):
(WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
(WebKit::NetworkLoad::supportsDataArray):
(WebKit::NetworkLoad::didReceiveDataArray):
(WebKit::NetworkLoad::didSendData):
(WebKit::NetworkLoad::receivedCancellation):
(WebKit::NetworkLoad::didReceiveResponse): Deleted.
Compile ResourceHandleClient when using NetworkSession because it is used for blobs now.
Also, add null checks because we now have NetworkLoads where either m_task or m_handle is always null.
* NetworkProcess/NetworkLoad.h:
(WebKit::NetworkLoad::pendingDownloadID):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
* NetworkProcess/mac/NetworkLoadMac.mm:
(WebKit::NetworkLoad::willCacheResponseAsync):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkLoadMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2016-02-11 Alex Christensen <achristensen@webkit.org>
+
+ Use BlobResourceHandle when loading blob urls, even when using NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=154096
+
+ Reviewed by Brady Eidson.
+
+ This fixes at least http/tests/xmlhttprequest/blob-request-byte-range.html.
+
+ * NetworkProcess/NetworkDataTask.h:
+ Renamed NetworkDataTaskClient::didReceiveResponse to didReceiveResponseNetworkSession
+ to avoid conflicting with ResourceHandleClient::didReceiveResponse.
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad):
+ Make a BlobResourceHandle instead of a NetworkDataTask if we have a request for a blob url.
+ (WebKit::NetworkLoad::~NetworkLoad):
+ (WebKit::NetworkLoad::setDefersLoading):
+ (WebKit::NetworkLoad::cancel):
+ (WebKit::NetworkLoad::continueWillSendRequest):
+ (WebKit::NetworkLoad::continueDidReceiveResponse):
+ (WebKit::NetworkLoad::sharedDidReceiveResponse):
+ (WebKit::NetworkLoad::convertTaskToDownload):
+ (WebKit::NetworkLoad::setPendingDownloadID):
+ (WebKit::NetworkLoad::didReceiveChallenge):
+ (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+ (WebKit::NetworkLoad::cannotShowURL):
+ (WebKit::NetworkLoad::didReceiveResponseAsync):
+ (WebKit::NetworkLoad::willSendRequestAsync):
+ (WebKit::NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync):
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ (WebKit::NetworkLoad::supportsDataArray):
+ (WebKit::NetworkLoad::didReceiveDataArray):
+ (WebKit::NetworkLoad::didSendData):
+ (WebKit::NetworkLoad::receivedCancellation):
+ (WebKit::NetworkLoad::didReceiveResponse): Deleted.
+ Compile ResourceHandleClient when using NetworkSession because it is used for blobs now.
+ Also, add null checks because we now have NetworkLoads where either m_task or m_handle is always null.
+ * NetworkProcess/NetworkLoad.h:
+ (WebKit::NetworkLoad::pendingDownloadID):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ * NetworkProcess/mac/NetworkLoadMac.mm:
+ (WebKit::NetworkLoad::willCacheResponseAsync):
+
</ins><span class="cx"> 2016-02-11 Frederic Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Bug 154103 - [GTK] Build error after bug 154046
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, RedirectCompletionHandler) = 0;
</span><span class="cx"> virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) = 0;
</span><del>- virtual void didReceiveResponse(const WebCore::ResourceResponse&, ResponseCompletionHandler) = 0;
</del><ins>+ virtual void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) = 0;
</ins><span class="cx"> virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) = 0;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
</span><span class="cx"> virtual void didBecomeDownload() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -32,13 +32,10 @@
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "WebErrors.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><ins>+#include <WebCore/ResourceHandle.h>
</ins><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
-#include <WebCore/ResourceHandle.h>
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -52,6 +49,10 @@
</span><span class="cx"> , m_currentRequest(parameters.request)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+ if (parameters.request.url().protocolIs("blob")) {
+ m_handle = ResourceHandle::create(nullptr, parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);
+ return;
+ }
</ins><span class="cx"> if (auto* networkSession = SessionTracker::networkSession(parameters.sessionID)) {
</span><span class="cx"> m_task = NetworkDataTask::create(*networkSession, *this, parameters.request, parameters.allowStoredCredentials);
</span><span class="cx"> if (!parameters.defersLoading)
</span><span class="lines">@@ -70,23 +71,23 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> if (m_responseCompletionHandler)
</span><span class="cx"> m_responseCompletionHandler(PolicyIgnore);
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx"> if (m_handle)
</span><span class="cx"> m_handle->clearClient();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::setDefersLoading(bool defers)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (defers)
- m_task->suspend();
- else
- m_task->resume();
-#else
</del><ins>+ if (m_task) {
+ if (defers)
+ m_task->suspend();
+ else
+ m_task->resume();
+ }
+#endif
</ins><span class="cx"> if (m_handle)
</span><span class="cx"> m_handle->setDefersLoading(defers);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::cancel()
</span><span class="lines">@@ -94,10 +95,9 @@
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> if (m_task)
</span><span class="cx"> m_task->cancel();
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx"> if (m_handle)
</span><span class="cx"> m_handle->cancel();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::continueWillSendRequest(const WebCore::ResourceRequest& newRequest)
</span><span class="lines">@@ -110,21 +110,18 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_currentRequest.isNull()) {
</span><del>-#if USE(NETWORK_SESSION)
- m_client.didFailLoading(cancelledError(m_currentRequest));
-#else
- m_handle->cancel();
</del><ins>+ if (m_handle)
+ m_handle->cancel();
</ins><span class="cx"> didFail(m_handle.get(), cancelledError(m_currentRequest));
</span><del>- return;
-#endif
- }
</del><ins>+ } else if (m_handle)
+ m_handle->continueWillSendRequest(m_currentRequest);
</ins><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> ASSERT(m_redirectCompletionHandler);
</span><del>- m_redirectCompletionHandler(m_currentRequest);
- m_redirectCompletionHandler = nullptr;
-#else
- m_handle->continueWillSendRequest(m_currentRequest);
</del><ins>+ if (m_redirectCompletionHandler) {
+ m_redirectCompletionHandler(m_currentRequest);
+ m_redirectCompletionHandler = nullptr;
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,11 +129,13 @@
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> ASSERT(m_responseCompletionHandler);
</span><del>- m_responseCompletionHandler(PolicyUse);
- m_responseCompletionHandler = nullptr;
-#else
- m_handle->continueDidReceiveResponse();
</del><ins>+ if (m_responseCompletionHandler) {
+ m_responseCompletionHandler(PolicyUse);
+ m_responseCompletionHandler = nullptr;
+ }
</ins><span class="cx"> #endif
</span><ins>+ if (m_handle)
+ m_handle->continueDidReceiveResponse();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NetworkLoadClient::ShouldContinueDidReceiveResponse NetworkLoad::sharedDidReceiveResponse(const ResourceResponse& receivedResponse)
</span><span class="lines">@@ -167,8 +166,10 @@
</span><span class="cx"> m_task->setPendingDownloadID(downloadID);
</span><span class="cx">
</span><span class="cx"> ASSERT(m_responseCompletionHandler);
</span><del>- m_responseCompletionHandler(PolicyDownload);
- m_responseCompletionHandler = nullptr;
</del><ins>+ if (m_responseCompletionHandler) {
+ m_responseCompletionHandler(PolicyDownload);
+ m_responseCompletionHandler = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
</span><span class="lines">@@ -213,7 +214,7 @@
</span><span class="cx"> m_client.canAuthenticateAgainstProtectionSpaceAsync(challenge.protectionSpace());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveResponse(const ResourceResponse& response, ResponseCompletionHandler completionHandler)
</del><ins>+void NetworkLoad::didReceiveResponseNetworkSession(const ResourceResponse& response, ResponseCompletionHandler completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (m_task && m_task->pendingDownloadID().downloadID())
</span><span class="lines">@@ -259,7 +260,7 @@
</span><span class="cx"> m_client.didFailLoading(cannotShowURLError(m_currentRequest));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void NetworkLoad::didReceiveResponseAsync(ResourceHandle* handle, const ResourceResponse& receivedResponse)
</span><span class="cx"> {
</span><span class="lines">@@ -301,9 +302,7 @@
</span><span class="cx"> sharedWillSendRedirectedRequest(request, redirectResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // USE(NETWORK_SESSION)
-
-#if USE(PROTECTION_SPACE_AUTH_CALLBACK) && !USE(NETWORK_SESSION)
</del><ins>+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</ins><span class="cx"> void NetworkLoad::canAuthenticateAgainstProtectionSpaceAsync(ResourceHandle* handle, const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="lines">@@ -332,6 +331,7 @@
</span><span class="cx"> void NetworkLoad::continueCanAuthenticateAgainstProtectionSpace(bool result)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><ins>+ ASSERT_WITH_MESSAGE(!m_handle, "Blobs should never give authentication challenges");
</ins><span class="cx"> ASSERT(m_challengeCompletionHandler);
</span><span class="cx"> auto completionHandler = WTFMove(m_challengeCompletionHandler);
</span><span class="cx"> if (!result) {
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK) && !USE(NETWORK_SESSION)
</del><ins>+#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</ins><span class="cx"> bool NetworkLoad::supportsDataArray()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -373,8 +373,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !USE(NETWORK_SESSION)
-
</del><span class="cx"> void NetworkLoad::didSendData(ResourceHandle* handle, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="lines">@@ -438,6 +436,4 @@
</span><span class="cx"> didFail(m_handle.get(), cancelledError(m_currentRequest));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !USE(NETWORK_SESSION)
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -29,22 +29,19 @@
</span><span class="cx"> #include "NetworkLoadClient.h"
</span><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><ins>+#include <WebCore/ResourceHandleClient.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> #include "DownloadID.h"
</span><span class="cx"> #include "NetworkSession.h"
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><del>-#else
-#include <WebCore/ResourceHandleClient.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class NetworkLoad
</del><ins>+class NetworkLoad : public WebCore::ResourceHandleClient
</ins><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- : public NetworkDataTaskClient
-#else
- : public WebCore::ResourceHandleClient
</del><ins>+ , public NetworkDataTaskClient
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="lines">@@ -66,17 +63,17 @@
</span><span class="cx"> void setPendingDownload(PendingDownload&);
</span><span class="cx"> DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); }
</span><span class="cx">
</span><del>- // NetworkSessionTaskClient.
- virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, std::function<void(const WebCore::ResourceRequest&)>) final override;
- virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)>) final override;
- virtual void didReceiveResponse(const WebCore::ResourceResponse&, std::function<void(WebCore::PolicyAction)>) final override;
</del><ins>+ // NetworkDataTaskClient
+ virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, RedirectCompletionHandler) final override;
+ virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) final override;
+ virtual void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) final override;
</ins><span class="cx"> virtual void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) final override;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) final override;
</span><span class="cx"> virtual void didBecomeDownload() final override;
</span><span class="cx"> virtual void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
</span><span class="cx"> virtual void wasBlocked() override;
</span><span class="cx"> virtual void cannotShowURL() override;
</span><del>-#else
</del><ins>+#endif
</ins><span class="cx"> // ResourceHandleClient
</span><span class="cx"> virtual void willSendRequestAsync(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
</span><span class="cx"> virtual void didSendData(WebCore::ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="lines">@@ -108,7 +105,6 @@
</span><span class="cx"> virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#endif // USE(NETWORK_SESSION)
</del><span class="cx">
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool);
</span><span class="lines">@@ -132,8 +128,8 @@
</span><span class="cx"> RedirectCompletionHandler m_redirectCompletionHandler;
</span><span class="cx"> #else
</span><span class="cx"> RefPtr<RemoteNetworkingContext> m_networkingContext;
</span><del>- RefPtr<WebCore::ResourceHandle> m_handle;
</del><span class="cx"> #endif
</span><ins>+ RefPtr<WebCore::ResourceHandle> m_handle;
</ins><span class="cx">
</span><span class="cx"> WebCore::ResourceRequest m_currentRequest; // Updated on redirects.
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> WebCore::ResourceResponse resourceResponse(response);
</span><span class="cx"> copyTimingData([dataTask _timingData], resourceResponse.resourceLoadTiming());
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><del>- networkDataTask->client().didReceiveResponse(resourceResponse, [completionHandlerCopy](WebCore::PolicyAction policyAction) {
</del><ins>+ networkDataTask->client().didReceiveResponseNetworkSession(resourceResponse, [completionHandlerCopy](WebCore::PolicyAction policyAction) {
</ins><span class="cx"> completionHandlerCopy(toNSURLSessionResponseDisposition(policyAction));
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkLoadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm (196427 => 196428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2016-02-11 19:43:56 UTC (rev 196427)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2016-02-11 19:49:38 UTC (rev 196428)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> m_handle->continueWillCacheResponse(cfResponse);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif !USE(NETWORK_SESSION)
</del><ins>+#else
</ins><span class="cx">
</span><span class="cx"> void NetworkLoad::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>