<!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>[192601] trunk/Source</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/192601">192601</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2015-11-18 17:17:14 -0800 (Wed, 18 Nov 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Progress towards implementing Downloads with NETWORK_SESSION

https://bugs.webkit.org/show_bug.cgi?id=151414

Reviewed begrudgingly by Brady Eidson.

Source/WebCore:

There is no change in behavior except that SessionIDs are sent across IPC and passed as parameters,

and they are not used yet.

Patch by Alex Christensen &lt;achristensen@webkit.org&gt; on 2015-11-18

* loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::continueAfterContentPolicy):

Removed an unused default. Compiler warnings will let us know if we add an unhandled case to this switch.

* loader/EmptyClients.h:

* loader/FrameLoaderClient.h:

Pass SessionIDs around.

Source/WebKit/mac:

Patch by Alex Christensen &lt;achristensen@webkit.org&gt; on 2015-11-18

* WebCoreSupport/WebFrameLoaderClient.h:

* WebCoreSupport/WebFrameLoaderClient.mm:

(WebFrameLoaderClient::detachedFromParent3):

(WebFrameLoaderClient::convertMainResourceLoadToDownload):

Source/WebKit2:

Patch by Alex Christensen &lt;achristensen@webkit.org&gt; on 2015-11-18

* NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::storageSession):

(WebKit::NetworkConnectionToWebProcess::startDownload):

(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):

* NetworkProcess/NetworkConnectionToWebProcess.h:

* NetworkProcess/NetworkConnectionToWebProcess.messages.in:

* NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::NetworkLoad):

(WebKit::NetworkLoad::didReceiveChallenge):

(WebKit::NetworkLoad::didReceiveResponse):

(WebKit::NetworkLoad::didReceiveData):

* NetworkProcess/NetworkLoad.h:

* NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):

(WebKit::NetworkProcess::downloadRequest):

(WebKit::NetworkProcess::resumeDownload):

* NetworkProcess/NetworkProcess.h:

* NetworkProcess/NetworkProcess.messages.in:

* NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::cleanup):

(WebKit::NetworkResourceLoader::didConvertHandleToDownload):

(WebKit::NetworkResourceLoader::abort):

* NetworkProcess/NetworkResourceLoader.h:

* NetworkProcess/NetworkSession.h:

* NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(toNSURLSessionResponseDisposition):

(-[NetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):

(-[NetworkSessionDelegate URLSession:dataTask:didReceiveData:]):

(-[NetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):

(-[NetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):

(-[NetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):

(-[NetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):

* Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::useCredentialForSingleChallenge):

(WebKit::AuthenticationManager::continueWithoutCredentialForSingleChallenge):

(WebKit::AuthenticationManager::cancelSingleChallenge):

(WebKit::AuthenticationManager::performDefaultHandlingForSingleChallenge):

(WebKit::AuthenticationManager::rejectProtectionSpaceAndContinueForSingleChallenge):

* Shared/Downloads/Download.h:

* Shared/Downloads/DownloadManager.cpp:

(WebKit::DownloadManager::DownloadManager):

(WebKit::DownloadManager::startDownload):

(WebKit::DownloadManager::convertHandleToDownload):

(WebKit::DownloadManager::resumeDownload):

(WebKit::DownloadManager::cancelDownload):

(WebKit::DownloadManager::downloadFinished):

(WebKit::DownloadManager::didCreateDownload):

* Shared/Downloads/DownloadManager.h:

(WebKit::DownloadManager::isDownloading):

(WebKit::DownloadManager::activeDownloadCount):

* Shared/Downloads/mac/DownloadMac.mm:

(WebKit::Download::start):

(WebKit::Download::startWithHandle):

(WebKit::Download::resume):

* UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::download):

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::canCachePage):

(WebKit::WebFrameLoaderClient::convertMainResourceLoadToDownload):

(WebKit::WebFrameLoaderClient::createFrame):

* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:

* WebProcess/WebPage/WebFrame.cpp:

(WebKit::WebFrame::startDownload):

(WebKit::WebFrame::convertMainResourceLoadToDownload):

(WebKit::WebFrame::source):

* WebProcess/WebPage/WebFrame.h:

* WebProcess/WebProcess.cpp:

(WebKit::WebProcess::downloadRequest):

(WebKit::WebProcess::resumeDownload):

(WebKit::WebProcess::releasePageCache):

(WebKit::WebProcess::fetchWebsiteData):

* WebProcess/WebProcess.h:

* WebProcess/WebProcess.messages.in:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>

<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>

<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>

<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>

<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>

<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</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="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcessNetworkSessionh">trunk/Source/WebKit2/NetworkProcess/NetworkSession.h</a></li>

<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>

<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>

<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadh">trunk/Source/WebKit2/Shared/Downloads/Download.h</a></li>

<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadManagercpp">trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp</a></li>

<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadManagerh">trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h</a></li>

<li><a href="#trunkSourceWebKit2SharedDownloadsmacDownloadMacmm">trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFrameh">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebCore/ChangeLog        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -1,3 +1,20 @@

</span><ins>+2015-11-18  Alex Christensen  &lt;achristensen@webkit.org&gt;

+

+        Progress towards implementing Downloads with NETWORK_SESSION

+        https://bugs.webkit.org/show_bug.cgi?id=151414

+

+        Reviewed begrudgingly by Brady Eidson.

+

+        There is no change in behavior except that SessionIDs are sent across IPC and passed as parameters,

+        and they are not used yet.

+

+        * loader/DocumentLoader.cpp:

+        (WebCore::DocumentLoader::continueAfterContentPolicy):

+        Removed an unused default. Compiler warnings will let us know if we add an unhandled case to this switch.

+        * loader/EmptyClients.h:

+        * loader/FrameLoaderClient.h:

+        Pass SessionIDs around.

+

</ins><span class="cx"> 2015-11-18  Andreas Kling  &lt;akling@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         ResourceUsageOverlay should have better accounting for reclaimable memory.

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebCore/loader/DocumentLoader.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -728,11 +728,15 @@

<span class="cx">         // Download may use this knowledge for purposes unrelated to cookies, notably for setting file quarantine data.

</span><span class="cx">         frameLoader()-&gt;setOriginalURLForDownloadRequest(m_request);

</span><span class="cx"> 

</span><ins>+        SessionID sessionID = SessionID::defaultSessionID();

+        if (frame() &amp;&amp; frame()-&gt;page())

+            sessionID = frame()-&gt;page()-&gt;sessionID();

+

</ins><span class="cx">         if (m_request.url().protocolIsData()) {

<span class="cx">             // We decode data URL internally, there is no resource load to convert.

</span><span class="cx">             frameLoader()-&gt;client().startDownload(m_request);

</span><span class="cx">         } else

</span><del>-            frameLoader()-&gt;client().convertMainResourceLoadToDownload(this, m_request, m_response);

</del><ins>+            frameLoader()-&gt;client().convertMainResourceLoadToDownload(this, sessionID, m_request, m_response);

</ins><span class="cx"> 

</span><span class="cx">         // It might have gone missing

</span><span class="cx">         if (mainResourceLoader())

</span><span class="lines">@@ -744,9 +748,6 @@

</span><span class="cx">             InspectorInstrumentation::continueWithPolicyIgnore(m_frame, *this, mainResourceLoader-&gt;identifier(), m_response);

</span><span class="cx">         stopLoadingForPolicyChange();

</span><span class="cx">         return;

</span><del>-    

-    default:

-        ASSERT_NOT_REACHED();

</del><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     if (m_response.isHTTP()) {

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebCore/loader/EmptyClients.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -250,7 +250,7 @@

</span><span class="cx">     virtual void detachedFromParent2() override { }

</span><span class="cx">     virtual void detachedFromParent3() override { }

</span><span class="cx"> 

</span><del>-    virtual void convertMainResourceLoadToDownload(DocumentLoader*, const ResourceRequest&amp;, const ResourceResponse&amp;) override { }

</del><ins>+    virtual void convertMainResourceLoadToDownload(DocumentLoader*, SessionID, const ResourceRequest&amp;, const ResourceResponse&amp;) override { }

</ins><span class="cx"> 

</span><span class="cx">     virtual void assignIdentifierToInitialRequest(unsigned long, DocumentLoader*, const ResourceRequest&amp;) override { }

</span><span class="cx">     virtual bool shouldUseCredentialStorage(DocumentLoader*, unsigned long) override { return false; }

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebCore/loader/FrameLoaderClient.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -94,6 +94,7 @@

</span><span class="cx">     class RTCPeerConnectionHandler;

</span><span class="cx"> #endif

</span><span class="cx">     class SecurityOrigin;

</span><ins>+    class SessionID;

</ins><span class="cx">     class SharedBuffer;

</span><span class="cx">     class StringWithDirection;

</span><span class="cx">     class SubstituteData;

</span><span class="lines">@@ -270,7 +271,7 @@

<span class="cx">         virtual void dispatchDidBecomeFrameset(bool) = 0; // Can change due to navigation or DOM modification.

</span><span class="cx"> 

</span><span class="cx">         virtual bool canCachePage() const = 0;

</span><del>-        virtual void convertMainResourceLoadToDownload(DocumentLoader*, const ResourceRequest&amp;, const ResourceResponse&amp;) = 0;

</del><ins>+        virtual void convertMainResourceLoadToDownload(DocumentLoader*, SessionID, const ResourceRequest&amp;, const ResourceResponse&amp;) = 0;

</ins><span class="cx"> 

</span><span class="cx">         virtual RefPtr&lt;Frame&gt; createFrame(const URL&amp;, const String&amp; name, HTMLFrameOwnerElement*, const String&amp; referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;

</span><span class="cx">         virtual RefPtr&lt;Widget&gt; createPlugin(const IntSize&amp;, HTMLPlugInElement*, const URL&amp;, const Vector&lt;String&gt;&amp;, const Vector&lt;String&gt;&amp;, const String&amp;, bool loadManually) = 0;

</span></span></pre></div>

<a id="trunkSourceWebKitmacChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit/mac/ChangeLog        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2015-11-18  Alex Christensen  &lt;achristensen@webkit.org&gt;

+

+        Progress towards implementing Downloads with NETWORK_SESSION

+        https://bugs.webkit.org/show_bug.cgi?id=151414

+

+        Reviewed begrudgingly by Brady Eidson.

+

+        * WebCoreSupport/WebFrameLoaderClient.h:

+        * WebCoreSupport/WebFrameLoaderClient.mm:

+        (WebFrameLoaderClient::detachedFromParent3):

+        (WebFrameLoaderClient::convertMainResourceLoadToDownload):

+

</ins><span class="cx"> 2015-11-18  Jer Noble  &lt;jer.noble@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Expose WebCore's AudioPlaybackRequiresUserGesture setting to WebKit &amp; WebKit2

</span></span></pre></div>

<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -39,12 +39,13 @@

</span><span class="cx"> @class WebResource;

</span><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><del>-    class AuthenticationChallenge;

-    class CachedFrame;

-    class HistoryItem;

-    class ProtectionSpace;

-    class ResourceLoader;

-    class ResourceRequest;

</del><ins>+class AuthenticationChallenge;

+class CachedFrame;

+class HistoryItem;

+class ProtectionSpace;

+class ResourceLoader;

+class ResourceRequest;

+class SessionID;

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> typedef HashMap&lt;RefPtr&lt;WebCore::ResourceLoader&gt;, RetainPtr&lt;WebResource&gt;&gt; ResourceMap;

</span><span class="lines">@@ -72,7 +73,7 @@

</span><span class="cx">     virtual void detachedFromParent2() override;

</span><span class="cx">     virtual void detachedFromParent3() override;

</span><span class="cx"> 

</span><del>-    virtual void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, const WebCore::ResourceRequest&amp;, const WebCore::ResourceResponse&amp;) override;

</del><ins>+    virtual void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&amp;, const WebCore::ResourceResponse&amp;) override;

</ins><span class="cx"> 

</span><span class="cx">     virtual void assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader*, const WebCore::ResourceRequest&amp;) override;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -284,7 +284,7 @@

</span><span class="cx">     m_webFrame-&gt;_private-&gt;webFrameView = nil;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void WebFrameLoaderClient::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, const ResourceRequest&amp; request, const ResourceResponse&amp; response)

</del><ins>+void WebFrameLoaderClient::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID, const ResourceRequest&amp; request, const ResourceResponse&amp; response)

</ins><span class="cx"> {

</span><span class="cx">     WebView *webView = getWebView(m_webFrame.get());

</span><span class="cx">     SubresourceLoader* mainResourceLoader = documentLoader-&gt;mainResourceLoader();

</span></span></pre></div>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/ChangeLog        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -1,3 +1,84 @@

</span><ins>+2015-11-18  Alex Christensen  &lt;achristensen@webkit.org&gt;

+

+        Progress towards implementing Downloads with NETWORK_SESSION

+        https://bugs.webkit.org/show_bug.cgi?id=151414

+

+        Reviewed begrudgingly by Brady Eidson.

+

+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:

+        (WebKit::storageSession):

+        (WebKit::NetworkConnectionToWebProcess::startDownload):

+        (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):

+        * NetworkProcess/NetworkConnectionToWebProcess.h:

+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:

+        * NetworkProcess/NetworkLoad.cpp:

+        (WebKit::NetworkLoad::NetworkLoad):

+        (WebKit::NetworkLoad::didReceiveChallenge):

+        (WebKit::NetworkLoad::didReceiveResponse):

+        (WebKit::NetworkLoad::didReceiveData):

+        * NetworkProcess/NetworkLoad.h:

+        * NetworkProcess/NetworkProcess.cpp:

+        (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):

+        (WebKit::NetworkProcess::downloadRequest):

+        (WebKit::NetworkProcess::resumeDownload):

+        * NetworkProcess/NetworkProcess.h:

+        * NetworkProcess/NetworkProcess.messages.in:

+        * NetworkProcess/NetworkResourceLoader.cpp:

+        (WebKit::NetworkResourceLoader::cleanup):

+        (WebKit::NetworkResourceLoader::didConvertHandleToDownload):

+        (WebKit::NetworkResourceLoader::abort):

+        * NetworkProcess/NetworkResourceLoader.h:

+        * NetworkProcess/NetworkSession.h:

+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:

+        (toNSURLSessionResponseDisposition):

+        (-[NetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):

+        (-[NetworkSessionDelegate URLSession:dataTask:didReceiveData:]):

+        (-[NetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):

+        (-[NetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):

+        (-[NetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):

+        (-[NetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):

+        * Shared/Authentication/AuthenticationManager.cpp:

+        (WebKit::AuthenticationManager::useCredentialForSingleChallenge):

+        (WebKit::AuthenticationManager::continueWithoutCredentialForSingleChallenge):

+        (WebKit::AuthenticationManager::cancelSingleChallenge):

+        (WebKit::AuthenticationManager::performDefaultHandlingForSingleChallenge):

+        (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinueForSingleChallenge):

+        * Shared/Downloads/Download.h:

+        * Shared/Downloads/DownloadManager.cpp:

+        (WebKit::DownloadManager::DownloadManager):

+        (WebKit::DownloadManager::startDownload):

+        (WebKit::DownloadManager::convertHandleToDownload):

+        (WebKit::DownloadManager::resumeDownload):

+        (WebKit::DownloadManager::cancelDownload):

+        (WebKit::DownloadManager::downloadFinished):

+        (WebKit::DownloadManager::didCreateDownload):

+        * Shared/Downloads/DownloadManager.h:

+        (WebKit::DownloadManager::isDownloading):

+        (WebKit::DownloadManager::activeDownloadCount):

+        * Shared/Downloads/mac/DownloadMac.mm:

+        (WebKit::Download::start):

+        (WebKit::Download::startWithHandle):

+        (WebKit::Download::resume):

+        * UIProcess/WebProcessPool.cpp:

+        (WebKit::WebProcessPool::download):

+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

+        (WebKit::WebFrameLoaderClient::canCachePage):

+        (WebKit::WebFrameLoaderClient::convertMainResourceLoadToDownload):

+        (WebKit::WebFrameLoaderClient::createFrame):

+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:

+        * WebProcess/WebPage/WebFrame.cpp:

+        (WebKit::WebFrame::startDownload):

+        (WebKit::WebFrame::convertMainResourceLoadToDownload):

+        (WebKit::WebFrame::source):

+        * WebProcess/WebPage/WebFrame.h:

+        * WebProcess/WebProcess.cpp:

+        (WebKit::WebProcess::downloadRequest):

+        (WebKit::WebProcess::resumeDownload):

+        (WebKit::WebProcess::releasePageCache):

+        (WebKit::WebProcess::fetchWebsiteData):

+        * WebProcess/WebProcess.h:

+        * WebProcess/WebProcess.messages.in:

+

</ins><span class="cx"> 2015-11-18  Chris Dumez  &lt;cdumez@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Clean up / optimize NetworkCacheSubresourcesEntry

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -179,17 +179,16 @@

</span><span class="cx">     return NetworkStorageSession::defaultStorageSession();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void NetworkConnectionToWebProcess::startDownload(SessionID, uint64_t downloadID, const ResourceRequest&amp; request)

</del><ins>+void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest&amp; request)

</ins><span class="cx"> {

<del>-    // FIXME: Do something with the session ID.

-    NetworkProcess::singleton().downloadManager().startDownload(downloadID, request);

</del><ins>+    NetworkProcess::singleton().downloadManager().startDownload(sessionID, downloadID, request);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const ResourceRequest&amp; request, const ResourceResponse&amp; response)

</del><ins>+void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const ResourceRequest&amp; request, const ResourceResponse&amp; response)

</ins><span class="cx"> {

</span><span class="cx">     auto&amp; networkProcess = NetworkProcess::singleton();

</span><span class="cx">     if (!mainResourceLoadIdentifier) {

</span><del>-        networkProcess.downloadManager().startDownload(downloadID, request);

</del><ins>+        networkProcess.downloadManager().startDownload(sessionID, downloadID, request);

</ins><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -79,7 +79,7 @@

</span><span class="cx">     void setDefersLoading(ResourceLoadIdentifier, bool);

</span><span class="cx">     void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::URL&amp; redirectURL);

</span><span class="cx">     void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&amp;);

</span><del>-    void convertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&amp;, const WebCore::ResourceResponse&amp;);

</del><ins>+    void convertMainResourceLoadToDownload(WebCore::SessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&amp;, const WebCore::ResourceResponse&amp;);

</ins><span class="cx"> 

</span><span class="cx">     void cookiesForDOM(WebCore::SessionID, const WebCore::URL&amp; firstParty, const WebCore::URL&amp;, String&amp; result);

</span><span class="cx">     void setCookiesFromDOM(WebCore::SessionID, const WebCore::URL&amp; firstParty, const WebCore::URL&amp;, const String&amp;);

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -32,7 +32,7 @@

</span><span class="cx">     PrefetchDNS(String hostname)

</span><span class="cx"> 

</span><span class="cx">     StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)

</span><del>-    ConvertMainResourceLoadToDownload(uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)

</del><ins>+    ConvertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)

</ins><span class="cx"> 

</span><span class="cx">     CookiesForDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url) -&gt; (String result)

</span><span class="cx">     SetCookiesFromDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, String cookieString)

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -48,10 +48,12 @@

</span><span class="cx">     : m_client(client)

</span><span class="cx">     , m_parameters(parameters)

</span><span class="cx">     , m_networkingContext(RemoteNetworkingContext::create(parameters.sessionID, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect))

</span><ins>+#if USE(NETWORK_SESSION)

+    , m_task(SessionTracker::networkSession(parameters.sessionID)-&gt;createDataTaskWithRequest(parameters.request, *this))

+#endif

</ins><span class="cx">     , m_currentRequest(parameters.request)

</span><span class="cx"> {

</span><span class="cx"> #if USE(NETWORK_SESSION)

</span><del>-    m_task = SessionTracker::networkSession(parameters.sessionID)-&gt;createDataTaskWithRequest(parameters.request, *this);

</del><span class="cx">     m_task-&gt;resume();

</span><span class="cx"> #else

</span><span class="cx">     m_handle = ResourceHandle::create(m_networkingContext.get(), parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);

</span><span class="lines">@@ -184,11 +186,11 @@

</span><span class="cx">     NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge, completionHandler);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void NetworkLoad::didReceiveResponse(const ResourceResponse&amp; response, std::function&lt;void(ResponseDisposition)&gt; completionHandler)

</del><ins>+void NetworkLoad::didReceiveResponse(const ResourceResponse&amp; response, std::function&lt;void(WebCore::PolicyAction)&gt; completionHandler)

</ins><span class="cx"> {

</span><span class="cx">     ASSERT(isMainThread());

</span><span class="cx">     sharedDidReceiveResponse(response);

</span><del>-    completionHandler(ResponseDisposition::Allow);

</del><ins>+    completionHandler(PolicyUse);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void NetworkLoad::didReceiveData(RefPtr&lt;SharedBuffer&gt;&amp;&amp; buffer)

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -63,7 +63,7 @@

<span class="cx">     // NetworkSessionTaskClient.

</span><span class="cx">     virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&amp;, const WebCore::ResourceRequest&amp;, std::function&lt;void(const WebCore::ResourceRequest&amp;)&gt;) final override;

</span><span class="cx">     virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&amp;, std::function&lt;void(AuthenticationChallengeDisposition, const WebCore::Credential&amp;)&gt;) final override;

</span><del>-    virtual void didReceiveResponse(const WebCore::ResourceResponse&amp;, std::function&lt;void(ResponseDisposition)&gt;) final override;

</del><ins>+    virtual void didReceiveResponse(const WebCore::ResourceResponse&amp;, std::function&lt;void(WebCore::PolicyAction)&gt;) final override;

</ins><span class="cx">     virtual void didReceiveData(RefPtr&lt;WebCore::SharedBuffer&gt;&amp;&amp;) final override;

</span><span class="cx">     virtual void didCompleteWithError(const WebCore::ResourceError&amp;) final override;

</span><span class="cx"> #else

</span><span class="lines">@@ -116,7 +116,7 @@

</span><span class="cx">     const NetworkLoadParameters m_parameters;

</span><span class="cx">     RefPtr&lt;RemoteNetworkingContext&gt; m_networkingContext;

</span><span class="cx"> #if USE(NETWORK_SESSION)

</span><del>-    RefPtr&lt;NetworkDataTask&gt; m_task;

</del><ins>+    Ref&lt;NetworkDataTask&gt; m_task;

</ins><span class="cx"> #else

</span><span class="cx">     RefPtr&lt;WebCore::ResourceHandle&gt; m_handle;

</span><span class="cx"> #endif

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -434,9 +434,9 @@

</span><span class="cx">     completionHandler();

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void NetworkProcess::downloadRequest(uint64_t downloadID, const ResourceRequest&amp; request)

</del><ins>+void NetworkProcess::downloadRequest(SessionID sessionID, uint64_t downloadID, const ResourceRequest&amp; request)

</ins><span class="cx"> {

</span><del>-    downloadManager().startDownload(downloadID, request);

</del><ins>+    downloadManager().startDownload(sessionID, downloadID, request);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> void NetworkProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference&amp; resumeData, const String&amp; path, const WebKit::SandboxExtension::Handle&amp; sandboxExtensionHandle)

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -47,6 +47,7 @@

</span><span class="cx"> class CertificateInfo;

</span><span class="cx"> class NetworkStorageSession;

</span><span class="cx"> class SecurityOrigin;

</span><ins>+class SessionID;

</ins><span class="cx"> struct SecurityOriginData;

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -150,7 +151,7 @@

<span class="cx">     // FIXME: This should take a session ID so we can identify which disk cache to delete.

</span><span class="cx">     void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function&lt;void ()&gt; completionHandler);

</span><span class="cx"> 

</span><del>-    void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&amp;);

</del><ins>+    void downloadRequest(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&amp;);

</ins><span class="cx">     void resumeDownload(uint64_t downloadID, const IPC::DataReference&amp; resumeData, const String&amp; path, const SandboxExtension::Handle&amp;);

</span><span class="cx">     void cancelDownload(uint64_t downloadID);

</span><span class="cx">     void setCacheModel(uint32_t);

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -41,7 +41,7 @@

</span><span class="cx">     DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)

</span><span class="cx">     DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector&lt;WebCore::SecurityOriginData&gt; origins, Vector&lt;String&gt; cookieHostNames, uint64_t callbackID)

</span><span class="cx"> 

</span><del>-    DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request)

</del><ins>+    DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)

</ins><span class="cx">     ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)

</span><span class="cx">     CancelDownload(uint64_t downloadID)

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -200,17 +200,23 @@

</span><span class="cx">     m_connection-&gt;didCleanupResourceLoader(*this);

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+#if !USE(NETWORK_SESSION)

</ins><span class="cx"> void NetworkResourceLoader::didConvertHandleToDownload()

</span><span class="cx"> {

</span><span class="cx">     ASSERT(m_networkLoad);

</span><span class="cx">     m_didConvertHandleToDownload = true;

</span><span class="cx"> }

</span><ins>+#endif

</ins><span class="cx"> 

</span><span class="cx"> void NetworkResourceLoader::abort()

</span><span class="cx"> {

</span><span class="cx">     ASSERT(RunLoop::isMain());

</span><span class="cx"> 

</span><del>-    if (m_networkLoad &amp;&amp; !m_didConvertHandleToDownload) {

</del><ins>+    if (m_networkLoad

+#if !USE(NETWORK_SESSION)

+        &amp;&amp; !m_didConvertHandleToDownload

+#endif

+    ) {

</ins><span class="cx">         m_networkLoad-&gt;cancel();

</span><span class="cx"> 

</span><span class="cx"> #if ENABLE(NETWORK_CACHE)

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -63,7 +63,9 @@

</span><span class="cx"> 

</span><span class="cx">     NetworkLoad* networkLoad() const { return m_networkLoad.get(); }

</span><span class="cx"> 

</span><ins>+#if !USE(NETWORK_SESSION)

</ins><span class="cx">     void didConvertHandleToDownload();

</span><ins>+#endif

</ins><span class="cx"> 

</span><span class="cx">     void start();

</span><span class="cx">     void abort();

</span><span class="lines">@@ -150,7 +152,9 @@

</span><span class="cx">     std::unique_ptr&lt;SynchronousLoadData&gt; m_synchronousLoadData;

</span><span class="cx">     Vector&lt;RefPtr&lt;WebCore::BlobDataFileReference&gt;&gt; m_fileReferences;

</span><span class="cx"> 

</span><ins>+#if !USE(NETWORK_SESSION)

</ins><span class="cx">     bool m_didConvertHandleToDownload { false };

</span><ins>+#endif

</ins><span class="cx">     bool m_didConsumeSandboxExtensions { false };

</span><span class="cx">     bool m_defersLoading { false };

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -31,6 +31,7 @@

</span><span class="cx"> OBJC_CLASS NSOperationQueue;

</span><span class="cx"> OBJC_CLASS NetworkSessionDelegate;

</span><span class="cx"> 

</span><ins>+#include &lt;WebCore/FrameLoaderTypes.h&gt;

</ins><span class="cx"> #include &lt;WebCore/SessionID.h&gt;

</span><span class="cx"> #include &lt;wtf/HashMap.h&gt;

</span><span class="cx"> #include &lt;wtf/Ref.h&gt;

</span><span class="lines">@@ -49,12 +50,6 @@

</span><span class="cx"> 

</span><span class="cx"> namespace WebKit {

</span><span class="cx"> 

</span><del>-enum class ResponseDisposition {

-    Cancel,

-    Allow,

-    BecomeDownload

-};

-

</del><span class="cx"> enum class AuthenticationChallengeDisposition {

</span><span class="cx">     UseCredential,

</span><span class="cx">     PerformDefaultHandling,

</span><span class="lines">@@ -68,7 +63,7 @@

</span><span class="cx"> public:

</span><span class="cx">     virtual void willPerformHTTPRedirection(const WebCore::ResourceResponse&amp;, const WebCore::ResourceRequest&amp;, std::function&lt;void(const WebCore::ResourceRequest&amp;)&gt;) = 0;

</span><span class="cx">     virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&amp;, std::function&lt;void(AuthenticationChallengeDisposition, const WebCore::Credential&amp;)&gt;) = 0;

</span><del>-    virtual void didReceiveResponse(const WebCore::ResourceResponse&amp;, std::function&lt;void(ResponseDisposition)&gt;) = 0;

</del><ins>+    virtual void didReceiveResponse(const WebCore::ResourceResponse&amp;, std::function&lt;void(WebCore::PolicyAction)&gt;) = 0;

</ins><span class="cx">     virtual void didReceiveData(RefPtr&lt;WebCore::SharedBuffer&gt;&amp;&amp;) = 0;

</span><span class="cx">     virtual void didCompleteWithError(const WebCore::ResourceError&amp;) = 0;

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -33,7 +33,9 @@

</span><span class="cx"> #import &lt;WebCore/AuthenticationChallenge.h&gt;

</span><span class="cx"> #import &lt;WebCore/CFNetworkSPI.h&gt;

</span><span class="cx"> #import &lt;WebCore/Credential.h&gt;

</span><ins>+#import &lt;WebCore/FrameLoaderTypes.h&gt;

</ins><span class="cx"> #import &lt;WebCore/NetworkStorageSession.h&gt;

</span><ins>+#import &lt;WebCore/NotImplemented.h&gt;

</ins><span class="cx"> #import &lt;WebCore/ResourceError.h&gt;

</span><span class="cx"> #import &lt;WebCore/ResourceRequest.h&gt;

</span><span class="cx"> #import &lt;WebCore/ResourceResponse.h&gt;

</span><span class="lines">@@ -41,14 +43,14 @@

</span><span class="cx"> #import &lt;wtf/MainThread.h&gt;

</span><span class="cx"> #import &lt;wtf/NeverDestroyed.h&gt;

</span><span class="cx"> 

</span><del>-static NSURLSessionResponseDisposition toNSURLSessionResponseDisposition(WebKit::ResponseDisposition disposition)

</del><ins>+static NSURLSessionResponseDisposition toNSURLSessionResponseDisposition(WebCore::PolicyAction disposition)

</ins><span class="cx"> {

</span><span class="cx">     switch (disposition) {

</span><del>-    case WebKit::ResponseDisposition::Cancel:

</del><ins>+    case WebCore::PolicyAction::PolicyIgnore:

</ins><span class="cx">         return NSURLSessionResponseCancel;

</span><del>-    case WebKit::ResponseDisposition::Allow:

</del><ins>+    case WebCore::PolicyAction::PolicyUse:

</ins><span class="cx">         return NSURLSessionResponseAllow;

</span><del>-    case WebKit::ResponseDisposition::BecomeDownload:

</del><ins>+    case WebCore::PolicyAction::PolicyDownload:

</ins><span class="cx">         return NSURLSessionResponseBecomeDownload;

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="lines">@@ -141,9 +143,9 @@

</span><span class="cx">             ASSERT(isMainThread());

</span><span class="cx">             WebCore::ResourceResponse resourceResponse(response);

</span><span class="cx">             auto completionHandlerCopy = Block_copy(completionHandler);

</span><del>-            client-&gt;didReceiveResponse(resourceResponse, [completionHandlerCopy](WebKit::ResponseDisposition responseDisposition)

</del><ins>+            client-&gt;didReceiveResponse(resourceResponse, [completionHandlerCopy](WebCore::PolicyAction policyAction)

</ins><span class="cx">                 {

</span><del>-                    completionHandlerCopy(toNSURLSessionResponseDisposition(responseDisposition));

</del><ins>+                    completionHandlerCopy(toNSURLSessionResponseDisposition(policyAction));

</ins><span class="cx">                     Block_release(completionHandlerCopy);

</span><span class="cx">                 }

</span><span class="cx">             );

</span><span class="lines">@@ -161,6 +163,26 @@

</span><span class="cx">     }

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location

+{

+    notImplemented();

+}

+

+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite

+{

+    notImplemented();

+}

+

+- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes

+{

+    notImplemented();

+}

+

+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask

+{

+    notImplemented();

+}

+

</ins><span class="cx"> @end

</span><span class="cx"> 

</span><span class="cx"> namespace WebKit {

</span></span></pre></div>

<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (192600 => 192601)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-11-19 00:54:37 UTC (rev 192600)

+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-11-19 01:17:14 UTC (rev 192601)

</span><span class="lines">@@ -194,23 +194,25 @@

</span><span class="cx">     if (tryUseCertificateInfoForChallenge(challenge.challenge, certificateInfo))

</span><span class="cx">         return;

</span><span class="cx"> 

</span><ins>+    AuthenticationClient* coreClient = challenge.challenge.authenticationClient();

</ins><span class="cx"> #if USE(NETWORK_SESSION)

<span class="cx">     // If there is a completion handler, then there is no AuthenticationClient.

<span class="cx">     // FIXME: Remove the use of AuthenticationClient in WebKit2 once NETWORK_SESSION is used for all loads.

</span><span class="cx">     if (challenge.completionHandler) {

</span><ins>+        ASSERT(!coreClient);

</ins><span class="cx">         challenge.completionHandler(AuthenticationChallengeDisposition::UseCredential, credential);

</span><span class="cx">         return;

</span><span class="cx">     }

</span><del>-#endif

-

-    AuthenticationClient* coreClient = challenge.challenge.authenticationClient();

</del><ins>+#else

</ins><span class="cx">     if (!coreClient) {

<span class="cx">         // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.