<!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>[174230] 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/174230">174230</a></dd>
<dt>Author</dt> <dd>jeffm@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 14:01:08 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKDownloadCopyRequest() returns 0 until the download starts
https://bugs.webkit.org/show_bug.cgi?id=137322
Reviewed by Anders Carlsson.
The m_request ivar in DownloadProxy was only being initialized when didStart() was called after the
download starts. Since clients have access to the ResourceRequest when the DownloadProxy is created,
there's no reason not to pass that along to DownloadProxy::create() so it can be returned if
WKDownloadCopyRequest() is called before didStart().
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::create):
Add ResourceRequest parameter, and pass it to DownloadProxy constructor.
(WebKit::DownloadProxy::DownloadProxy):
Initialize m_request.
* UIProcess/Downloads/DownloadProxy.h:
Add ResourceRequest parameter to create() and constructor.
* UIProcess/Downloads/DownloadProxyMap.cpp:
(WebKit::DownloadProxyMap::createDownloadProxy):
Add ResourceRequest parameter and pass it to DownloadProxy::create().
* UIProcess/Downloads/DownloadProxyMap.h:
Add ResourceRequest parameter to createDownloadProxy().
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::createDownloadProxy):
Add ResourceRequest parameter and pass it to DownloadProxy::create().
* UIProcess/Network/NetworkProcessProxy.h:
Add ResourceRequest parameter to createDownloadProxy().
* UIProcess/WebContext.cpp:
(WebKit::WebContext::download):
Pass ResourceRequest to createDownloadProxy().
(WebKit::WebContext::createDownloadProxy):
Add ResourceRequest parameter and pass it to createDownloadProxy() functions.
* UIProcess/WebContext.h:
Add ResourceRequest parameter to createDownloadProxy().
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::receivedPolicyDecision):
Pass m_decidePolicyForResponseRequest to WebContext::createDownloadProxy().
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createDownloadProxy):
Add ResourceRequest parameter and pass it to DownloadProxyMap::create().
* UIProcess/WebProcessProxy.h:
Add ResourceRequest parameter to createDownloadProxy().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyh">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyMapcpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyMaph">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2014-10-02 Jeff Miller <jeffm@apple.com>
+
+ WKDownloadCopyRequest() returns 0 until the download starts
+ https://bugs.webkit.org/show_bug.cgi?id=137322
+
+ Reviewed by Anders Carlsson.
+
+ The m_request ivar in DownloadProxy was only being initialized when didStart() was called after the
+ download starts. Since clients have access to the ResourceRequest when the DownloadProxy is created,
+ there's no reason not to pass that along to DownloadProxy::create() so it can be returned if
+ WKDownloadCopyRequest() is called before didStart().
+
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::DownloadProxy::create):
+ Add ResourceRequest parameter, and pass it to DownloadProxy constructor.
+
+ (WebKit::DownloadProxy::DownloadProxy):
+ Initialize m_request.
+
+ * UIProcess/Downloads/DownloadProxy.h:
+ Add ResourceRequest parameter to create() and constructor.
+
+ * UIProcess/Downloads/DownloadProxyMap.cpp:
+ (WebKit::DownloadProxyMap::createDownloadProxy):
+ Add ResourceRequest parameter and pass it to DownloadProxy::create().
+
+ * UIProcess/Downloads/DownloadProxyMap.h:
+ Add ResourceRequest parameter to createDownloadProxy().
+
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::createDownloadProxy):
+ Add ResourceRequest parameter and pass it to DownloadProxy::create().
+
+ * UIProcess/Network/NetworkProcessProxy.h:
+ Add ResourceRequest parameter to createDownloadProxy().
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::download):
+ Pass ResourceRequest to createDownloadProxy().
+
+ (WebKit::WebContext::createDownloadProxy):
+ Add ResourceRequest parameter and pass it to createDownloadProxy() functions.
+
+ * UIProcess/WebContext.h:
+ Add ResourceRequest parameter to createDownloadProxy().
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::receivedPolicyDecision):
+ Pass m_decidePolicyForResponseRequest to WebContext::createDownloadProxy().
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::createDownloadProxy):
+ Add ResourceRequest parameter and pass it to DownloadProxyMap::create().
+
+ * UIProcess/WebProcessProxy.h:
+ Add ResourceRequest parameter to createDownloadProxy().
+
</ins><span class="cx"> 2014-10-01 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Have is<>(T*) function do a null check on the pointer argument
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -51,15 +51,16 @@
</span><span class="cx"> return ++uniqueDownloadID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<DownloadProxy> DownloadProxy::create(DownloadProxyMap& downloadProxyMap, WebContext& webContext)
</del><ins>+PassRefPtr<DownloadProxy> DownloadProxy::create(DownloadProxyMap& downloadProxyMap, WebContext& webContext, const ResourceRequest& resourceRequest)
</ins><span class="cx"> {
</span><del>- return adoptRef(new DownloadProxy(downloadProxyMap, webContext));
</del><ins>+ return adoptRef(new DownloadProxy(downloadProxyMap, webContext, resourceRequest));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebContext& webContext)
</del><ins>+DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebContext& webContext, const ResourceRequest& resourceRequest)
</ins><span class="cx"> : m_downloadProxyMap(downloadProxyMap)
</span><span class="cx"> , m_webContext(&webContext)
</span><span class="cx"> , m_downloadID(generateDownloadID())
</span><ins>+ , m_request(resourceRequest)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class DownloadProxy : public API::ObjectImpl<API::Object::Type::Download>, public IPC::MessageReceiver {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext&);
</del><ins>+ static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext&, const WebCore::ResourceRequest&);
</ins><span class="cx"> ~DownloadProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t downloadID() const { return m_downloadID; }
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> void didReceiveSyncDownloadProxyMessage(IPC::Connection*, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit DownloadProxy(DownloadProxyMap&, WebContext&);
</del><ins>+ explicit DownloadProxy(DownloadProxyMap&, WebContext&, const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> ASSERT(m_downloads.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy* DownloadProxyMap::createDownloadProxy(WebContext& webContext)
</del><ins>+DownloadProxy* DownloadProxyMap::createDownloadProxy(WebContext& webContext, const WebCore::ResourceRequest& resourceRequest)
</ins><span class="cx"> {
</span><del>- RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(*this, webContext);
</del><ins>+ RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(*this, webContext, resourceRequest);
</ins><span class="cx"> m_downloads.set(downloadProxy->downloadID(), downloadProxy);
</span><span class="cx">
</span><span class="cx"> m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID(), *downloadProxy);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -30,6 +30,10 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><ins>+namespace WebCore {
+class ResourceRequest;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ChildProcessProxy;
</span><span class="lines">@@ -43,7 +47,7 @@
</span><span class="cx"> explicit DownloadProxyMap(ChildProcessProxy*);
</span><span class="cx"> ~DownloadProxyMap();
</span><span class="cx">
</span><del>- DownloadProxy* createDownloadProxy(WebContext&);
</del><ins>+ DownloadProxy* createDownloadProxy(WebContext&, const WebCore::ResourceRequest&);
</ins><span class="cx"> void downloadFinished(DownloadProxy*);
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const { return m_downloads.isEmpty(); }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -97,12 +97,12 @@
</span><span class="cx"> connection()->send(Messages::NetworkProcess::CreateNetworkConnectionToWebProcess(), 0, IPC::DispatchMessageEvenWhenWaitingForSyncReply);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy* NetworkProcessProxy::createDownloadProxy()
</del><ins>+DownloadProxy* NetworkProcessProxy::createDownloadProxy(const ResourceRequest& resourceRequest)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_downloadProxyMap)
</span><span class="cx"> m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
</span><span class="cx">
</span><del>- return m_downloadProxyMap->createDownloadProxy(m_webContext);
</del><ins>+ return m_downloadProxyMap->createDownloadProxy(m_webContext, resourceRequest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><ins>+class ResourceRequest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
</span><span class="cx">
</span><del>- DownloadProxy* createDownloadProxy();
</del><ins>+ DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* WebContext::download(WebPageProxy* initiatingPage, const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- DownloadProxy* downloadProxy = createDownloadProxy();
</del><ins>+ DownloadProxy* downloadProxy = createDownloadProxy(request);
</ins><span class="cx"> uint64_t initiatingPageID = initiatingPage ? initiatingPage->pageID() : 0;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -1055,17 +1055,17 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetDefaultRequestTimeoutInterval(timeoutInterval));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy* WebContext::createDownloadProxy()
</del><ins>+DownloadProxy* WebContext::createDownloadProxy(const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (usesNetworkProcess()) {
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> ASSERT(m_networkProcess);
</span><del>- return m_networkProcess->createDownloadProxy();
</del><ins>+ return m_networkProcess->createDownloadProxy(request);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return ensureSharedWebProcess().createDownloadProxy();
</del><ins>+ return ensureSharedWebProcess().createDownloadProxy(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContext::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> void setEnhancedAccessibility(bool);
</span><span class="cx">
</span><span class="cx"> // Downloads.
</span><del>- DownloadProxy* createDownloadProxy();
</del><ins>+ DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</ins><span class="cx"> API::DownloadClient& downloadClient() { return *m_downloadClient; }
</span><span class="cx">
</span><span class="cx"> API::HistoryClient& historyClient() { return *m_historyClient; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -1788,7 +1788,9 @@
</span><span class="cx"> uint64_t downloadID = 0;
</span><span class="cx"> if (action == PolicyDownload) {
</span><span class="cx"> // Create a download proxy.
</span><del>- DownloadProxy* download = m_process->context().createDownloadProxy();
</del><ins>+ // FIXME: We should ensure that the downloadRequest is never empty.
+ const ResourceRequest& downloadRequest = m_decidePolicyForResponseRequest ? *m_decidePolicyForResponseRequest : ResourceRequest();
+ DownloadProxy* download = m_process->context().createDownloadProxy(downloadRequest);
</ins><span class="cx"> downloadID = download->downloadID();
</span><span class="cx"> handleDownloadRequest(download);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx"> send(Messages::WebProcess::SetTextCheckerState(TextChecker::state()), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DownloadProxy* WebProcessProxy::createDownloadProxy()
</del><ins>+DownloadProxy* WebProcessProxy::createDownloadProxy(const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> ASSERT(!m_context->usesNetworkProcess());
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> if (!m_downloadProxyMap)
</span><span class="cx"> m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
</span><span class="cx">
</span><del>- return m_downloadProxyMap->createDownloadProxy(m_context.get());
</del><ins>+ return m_downloadProxyMap->createDownloadProxy(m_context.get(), request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore& store, uint64_t frameID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (174229 => 174230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-02 20:56:52 UTC (rev 174229)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-02 21:01:08 UTC (rev 174230)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class ResourceRequest;
</ins><span class="cx"> class URL;
</span><span class="cx"> struct PluginInfo;
</span><span class="cx"> };
</span><span class="lines">@@ -118,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> static bool fullKeyboardAccessEnabled();
</span><span class="cx">
</span><del>- DownloadProxy* createDownloadProxy();
</del><ins>+ DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> void pageSuppressibilityChanged(WebPageProxy*);
</span><span class="cx"> void pagePreferencesChanged(WebPageProxy*);
</span></span></pre>
</div>
</div>
</body>
</html>