<!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>[194264] 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/194264">194264</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-12-18 00:10:53 -0800 (Fri, 18 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add types for DownloadID and TaskIdentifier
https://bugs.webkit.org/show_bug.cgi?id=152401
Reviewed by Brady Eidson.
DownloadID and TaskIdentifier used to both be just uint64_t's.
It is confusing to distinguish between them, so now they both have names.
We need a HashMap<TaskIdentifier, DownloadID> instead of a HashMap<uint64_t, uint64_t>.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::storageSession):
(WebKit::NetworkConnectionToWebProcess::startDownload):
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
(WebKit::NetworkProcess::downloadRequest):
(WebKit::NetworkProcess::resumeDownload):
(WebKit::NetworkProcess::cancelDownload):
(WebKit::NetworkProcess::getNetworkProcessStatistics):
(WebKit::NetworkProcess::logDiagnosticMessage):
(WebKit::NetworkProcess::logDiagnosticMessageWithResult):
(WebKit::NetworkProcess::logDiagnosticMessageWithValue):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkSession.h:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSession::createDataTaskWithRequest):
(WebKit::NetworkSession::dataTaskForIdentifier):
(WebKit::NetworkDataTask::resume):
(WebKit::NetworkDataTask::taskIdentifier): Deleted.
* Shared/Downloads/Download.cpp:
(WebKit::Download::Download):
(WebKit::Download::messageSenderDestinationID):
* Shared/Downloads/Download.h:
(WebKit::Download::downloadID):
* Shared/Downloads/DownloadID.h: Added.
(WebKit::DownloadID::DownloadID):
(WebKit::DownloadID::operator==):
(WebKit::DownloadID::downloadID):
(IPC::ArgumentCoder<WebKit::DownloadID>::encode):
(IPC::ArgumentCoder<WebKit::DownloadID>::decode):
(WTF::DownloadIDHash::hash):
(WTF::DownloadIDHash::equal):
(WTF::HashTraits<WebKit::DownloadID>::emptyValue):
(WTF::HashTraits<WebKit::DownloadID>::constructDeletedValue):
(WTF::HashTraits<WebKit::DownloadID>::isDeletedValue):
* Shared/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::DownloadManager):
(WebKit::DownloadManager::startDownload):
(WebKit::DownloadManager::convertHandleToDownload):
(WebKit::DownloadManager::resumeDownload):
(WebKit::DownloadManager::cancelDownload):
* Shared/Downloads/DownloadManager.h:
(WebKit::DownloadManager::isDownloading):
* UIProcess/API/C/WKDownload.cpp:
(WKDownloadGetID):
(WKDownloadCopyRequest):
* UIProcess/Downloads/DownloadProxy.h:
(WebKit::DownloadProxy::downloadID):
(WebKit::DownloadProxy::request):
(WebKit::DownloadProxy::resumeData):
* UIProcess/Downloads/DownloadProxyMap.cpp:
(WebKit::DownloadProxyMap::createDownloadProxy):
(WebKit::DownloadProxyMap::downloadFinished):
(WebKit::DownloadProxyMap::processDidClose):
* UIProcess/Downloads/DownloadProxyMap.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::receivedPolicyDecision):
(WebKit::WebPageProxy::frameDidBecomeFrameSet):
(WebKit::WebPageProxy::decidePolicyForNavigationAction):
(WebKit::WebPageProxy::decidePolicyForResponse):
(WebKit::WebPageProxy::decidePolicyForResponseSync):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::invalidatePolicyListener):
(WebKit::WebFrame::didReceivePolicyDecision):
(WebKit::WebFrame::startDownload):
(WebKit::WebFrame::convertMainResourceLoadToDownload):
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setSessionID):
(WebKit::WebPage::didReceivePolicyDecision):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<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="#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="#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="#trunkSourceWebKit2SharedDownloadsDownloadcpp">trunk/Source/WebKit2/Shared/Downloads/Download.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="#trunkSourceWebKit2UIProcessAPICWKDownloadcpp">trunk/Source/WebKit2/UIProcess/API/C/WKDownload.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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</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="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedDownloadsDownloadIDh">trunk/Source/WebKit2/Shared/Downloads/DownloadID.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -1,3 +1,97 @@
</span><ins>+2015-12-18 Alex Christensen <achristensen@webkit.org>
+
+ Add types for DownloadID and TaskIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=152401
+
+ Reviewed by Brady Eidson.
+
+ DownloadID and TaskIdentifier used to both be just uint64_t's.
+ It is confusing to distinguish between them, so now they both have names.
+ We need a HashMap<TaskIdentifier, DownloadID> instead of a HashMap<uint64_t, uint64_t>.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::storageSession):
+ (WebKit::NetworkConnectionToWebProcess::startDownload):
+ (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+ (WebKit::NetworkProcess::downloadRequest):
+ (WebKit::NetworkProcess::resumeDownload):
+ (WebKit::NetworkProcess::cancelDownload):
+ (WebKit::NetworkProcess::getNetworkProcessStatistics):
+ (WebKit::NetworkProcess::logDiagnosticMessage):
+ (WebKit::NetworkProcess::logDiagnosticMessageWithResult):
+ (WebKit::NetworkProcess::logDiagnosticMessageWithValue):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/NetworkSession.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSession::createDataTaskWithRequest):
+ (WebKit::NetworkSession::dataTaskForIdentifier):
+ (WebKit::NetworkDataTask::resume):
+ (WebKit::NetworkDataTask::taskIdentifier): Deleted.
+ * Shared/Downloads/Download.cpp:
+ (WebKit::Download::Download):
+ (WebKit::Download::messageSenderDestinationID):
+ * Shared/Downloads/Download.h:
+ (WebKit::Download::downloadID):
+ * Shared/Downloads/DownloadID.h: Added.
+ (WebKit::DownloadID::DownloadID):
+ (WebKit::DownloadID::operator==):
+ (WebKit::DownloadID::downloadID):
+ (IPC::ArgumentCoder<WebKit::DownloadID>::encode):
+ (IPC::ArgumentCoder<WebKit::DownloadID>::decode):
+ (WTF::DownloadIDHash::hash):
+ (WTF::DownloadIDHash::equal):
+ (WTF::HashTraits<WebKit::DownloadID>::emptyValue):
+ (WTF::HashTraits<WebKit::DownloadID>::constructDeletedValue):
+ (WTF::HashTraits<WebKit::DownloadID>::isDeletedValue):
+ * Shared/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::DownloadManager):
+ (WebKit::DownloadManager::startDownload):
+ (WebKit::DownloadManager::convertHandleToDownload):
+ (WebKit::DownloadManager::resumeDownload):
+ (WebKit::DownloadManager::cancelDownload):
+ * Shared/Downloads/DownloadManager.h:
+ (WebKit::DownloadManager::isDownloading):
+ * UIProcess/API/C/WKDownload.cpp:
+ (WKDownloadGetID):
+ (WKDownloadCopyRequest):
+ * UIProcess/Downloads/DownloadProxy.h:
+ (WebKit::DownloadProxy::downloadID):
+ (WebKit::DownloadProxy::request):
+ (WebKit::DownloadProxy::resumeData):
+ * UIProcess/Downloads/DownloadProxyMap.cpp:
+ (WebKit::DownloadProxyMap::createDownloadProxy):
+ (WebKit::DownloadProxyMap::downloadFinished):
+ (WebKit::DownloadProxyMap::processDidClose):
+ * UIProcess/Downloads/DownloadProxyMap.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::receivedPolicyDecision):
+ (WebKit::WebPageProxy::frameDidBecomeFrameSet):
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::decidePolicyForResponse):
+ (WebKit::WebPageProxy::decidePolicyForResponseSync):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::invalidatePolicyListener):
+ (WebKit::WebFrame::didReceivePolicyDecision):
+ (WebKit::WebFrame::startDownload):
+ (WebKit::WebFrame::convertMainResourceLoadToDownload):
+ * WebProcess/WebPage/WebFrame.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setSessionID):
+ (WebKit::WebPage::didReceivePolicyDecision):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-12-17 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed a typo from r194022.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -177,12 +177,12 @@
</span><span class="cx"> return NetworkStorageSession::defaultStorageSession();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
</del><ins>+void NetworkConnectionToWebProcess::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> NetworkProcess::singleton().downloadManager().startDownload(sessionID, downloadID, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const ResourceRequest& request, const ResourceResponse& response)
</del><ins>+void NetworkConnectionToWebProcess::convertMainResourceLoadToDownload(SessionID sessionID, uint64_t mainResourceLoadIdentifier, DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> auto& networkProcess = NetworkProcess::singleton();
</span><span class="cx"> if (!mainResourceLoadIdentifier) {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BlockingResponseMap.h"
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include <WebCore/ResourceLoadPriority.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -76,8 +77,8 @@
</span><span class="cx"> void removeLoadIdentifier(ResourceLoadIdentifier);
</span><span class="cx"> void setDefersLoading(ResourceLoadIdentifier, bool);
</span><span class="cx"> void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::URL& redirectURL);
</span><del>- void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
- void convertMainResourceLoadToDownload(WebCore::SessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</del><ins>+ void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
+ void convertMainResourceLoadToDownload(WebCore::SessionID, uint64_t mainResourceLoadIdentifier, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</ins><span class="cx">
</span><span class="cx"> void cookiesForDOM(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, String& result);
</span><span class="cx"> void setCookiesFromDOM(WebCore::SessionID, const WebCore::URL& firstParty, const WebCore::URL&, const String&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> SetDefersLoading(uint64_t resourceLoadIdentifier, bool defers)
</span><span class="cx"> PrefetchDNS(String hostname)
</span><span class="cx">
</span><del>- StartDownload(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
- ConvertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, uint64_t downloadID, WebCore::ResourceRequest request, WebCore::ResourceResponse response)
</del><ins>+ StartDownload(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
+ ConvertMainResourceLoadToDownload(WebCore::SessionID sessionID, uint64_t mainResourceLoadIdentifier, WebKit::DownloadID 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) -> (String result)
</span><span class="cx"> SetCookiesFromDOM(WebCore::SessionID sessionID, WebCore::URL firstParty, WebCore::URL url, String cookieString)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -432,17 +432,17 @@
</span><span class="cx"> completionHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::downloadRequest(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
</del><ins>+void NetworkProcess::downloadRequest(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> downloadManager().startDownload(sessionID, downloadID, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::resumeDownload(SessionID sessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
</del><ins>+void NetworkProcess::resumeDownload(SessionID sessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
</ins><span class="cx"> {
</span><span class="cx"> downloadManager().resumeDownload(sessionID, downloadID, resumeData, path, sandboxExtensionHandle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::cancelDownload(uint64_t downloadID)
</del><ins>+void NetworkProcess::cancelDownload(DownloadID downloadID)
</ins><span class="cx"> {
</span><span class="cx"> downloadManager().cancelDownload(downloadID);
</span><span class="cx"> }
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessPool::DidGetStatistics(data, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, WebCore::ShouldSample shouldSample)
</del><ins>+void NetworkProcess::logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::LogSampledDiagnosticMessage(webPageID, message, description), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result, WebCore::ShouldSample shouldSample)
</del><ins>+void NetworkProcess::logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, DiagnosticLoggingResultType result, ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::LogSampledDiagnosticMessageWithResult(webPageID, message, description, result), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, WebCore::ShouldSample shouldSample)
</del><ins>+void NetworkProcess::logDiagnosticMessageWithValue(uint64_t webPageID, const String& message, const String& description, const String& value, ShouldSample shouldSample)
</ins><span class="cx"> {
</span><span class="cx"> if (!DiagnosticLoggingClient::shouldLogAfterSampling(shouldSample))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -149,9 +149,9 @@
</span><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<void ()> completionHandler);
</span><span class="cx">
</span><del>- void downloadRequest(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
- void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
- void cancelDownload(uint64_t downloadID);
</del><ins>+ void downloadRequest(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
+ void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+ void cancelDownload(DownloadID);
</ins><span class="cx"> void setCacheModel(uint32_t);
</span><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
</span><span class="cx"> void setCanHandleHTTPSServerTrustEvaluation(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -39,9 +39,9 @@
</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<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</span><span class="cx">
</span><del>- DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
- ResumeDownload(WebCore::SessionID sessionID, uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
- CancelDownload(uint64_t downloadID)
</del><ins>+ DownloadRequest(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
+ ResumeDownload(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+ CancelDownload(WebKit::DownloadID downloadID)
</ins><span class="cx">
</span><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkSession.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkSession.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -26,11 +26,14 @@
</span><span class="cx"> #ifndef NetworkSession_h
</span><span class="cx"> #define NetworkSession_h
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> OBJC_CLASS NSURLSession;
</span><span class="cx"> OBJC_CLASS NSURLSessionDataTask;
</span><span class="cx"> OBJC_CLASS NSOperationQueue;
</span><span class="cx"> OBJC_CLASS WKNetworkSessionDelegate;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -80,7 +83,8 @@
</span><span class="cx"> void cancel();
</span><span class="cx"> void resume();
</span><span class="cx">
</span><del>- uint64_t taskIdentifier();
</del><ins>+ typedef uint64_t TaskIdentifier;
+ TaskIdentifier taskIdentifier();
</ins><span class="cx">
</span><span class="cx"> ~NetworkDataTask();
</span><span class="cx">
</span><span class="lines">@@ -112,11 +116,12 @@
</span><span class="cx">
</span><span class="cx"> Ref<NetworkDataTask> createDataTaskWithRequest(const WebCore::ResourceRequest&, NetworkSessionTaskClient&);
</span><span class="cx">
</span><del>- NetworkDataTask* dataTaskForIdentifier(uint64_t);
</del><ins>+ NetworkDataTask* dataTaskForIdentifier(NetworkDataTask::TaskIdentifier);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebCore::SessionID m_sessionID;
</span><del>- HashMap<uint64_t, NetworkDataTask*> m_dataTaskMap;
</del><ins>+ HashMap<NetworkDataTask::TaskIdentifier, NetworkDataTask*> m_dataTaskMap;
+ HashMap<NetworkDataTask::TaskIdentifier, DownloadID> m_downloadMap;
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<NSURLSession> m_session;
</span><span class="cx"> RetainPtr<WKNetworkSessionDelegate> m_sessionDelegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> return adoptRef(*new NetworkDataTask(*this, client, [m_session dataTaskWithRequest:request.nsURLRequest(WebCore::UpdateHTTPBody)]));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NetworkDataTask* NetworkSession::dataTaskForIdentifier(uint64_t taskIdentifier)
</del><ins>+NetworkDataTask* NetworkSession::dataTaskForIdentifier(NetworkDataTask::TaskIdentifier taskIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> return m_dataTaskMap.get(taskIdentifier);
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> [m_task resume];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t NetworkDataTask::taskIdentifier()
</del><ins>+auto NetworkDataTask::taskIdentifier() -> TaskIdentifier
</ins><span class="cx"> {
</span><span class="cx"> return [m_task taskIdentifier];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/Download.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/Download.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -44,9 +44,9 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>-Download::Download(DownloadManager& downloadManager, const NetworkSession& session, uint64_t downloadID, const ResourceRequest& request)
</del><ins>+Download::Download(DownloadManager& downloadManager, const NetworkSession& session, DownloadID downloadID, const ResourceRequest& request)
</ins><span class="cx"> #else
</span><del>-Download::Download(DownloadManager& downloadManager, uint64_t downloadID, const ResourceRequest& request)
</del><ins>+Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request)
</ins><span class="cx"> #endif
</span><span class="cx"> : m_downloadManager(downloadManager)
</span><span class="cx"> , m_downloadID(downloadID)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> , m_session(session)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- ASSERT(m_downloadID);
</del><ins>+ ASSERT(m_downloadID.downloadID());
</ins><span class="cx">
</span><span class="cx"> m_downloadManager.didCreateDownload();
</span><span class="cx"> }
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t Download::messageSenderDestinationID()
</span><span class="cx"> {
</span><del>- return m_downloadID;
</del><ins>+ return m_downloadID.downloadID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/Download.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef Download_h
</span><span class="cx"> #define Download_h
</span><span class="cx">
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="lines">@@ -76,9 +77,9 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Download);
</span><span class="cx"> public:
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- Download(DownloadManager&, const NetworkSession&, uint64_t downloadID, const WebCore::ResourceRequest&);
</del><ins>+ Download(DownloadManager&, const NetworkSession&, DownloadID, const WebCore::ResourceRequest&);
</ins><span class="cx"> #else
</span><del>- Download(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
</del><ins>+ Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&);
</ins><span class="cx"> #endif
</span><span class="cx"> ~Download();
</span><span class="cx">
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx"> void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</span><span class="cx"> void cancel();
</span><span class="cx">
</span><del>- uint64_t downloadID() const { return m_downloadID; }
</del><ins>+ DownloadID downloadID() const { return m_downloadID; }
</ins><span class="cx">
</span><span class="cx"> void didStart();
</span><span class="cx"> void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
</span><span class="lines">@@ -128,7 +129,7 @@
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span><span class="cx"> DownloadManager& m_downloadManager;
</span><del>- uint64_t m_downloadID;
</del><ins>+ DownloadID m_downloadID;
</ins><span class="cx"> WebCore::ResourceRequest m_request;
</span><span class="cx">
</span><span class="cx"> RefPtr<SandboxExtension> m_sandboxExtension;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadIDh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/Downloads/DownloadID.h (0 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadID.h (rev 0)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadID.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -0,0 +1,95 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DownloadID_h
+#define DownloadID_h
+
+#include "ArgumentCoder.h"
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+#include <wtf/HashTraits.h>
+
+namespace WebKit {
+
+class DownloadID {
+public:
+ DownloadID()
+ {
+ }
+
+ explicit DownloadID(uint64_t downloadID)
+ : m_downloadID(downloadID)
+ {
+ }
+
+ bool operator==(DownloadID other) const { return m_downloadID == other.m_downloadID; }
+
+ uint64_t downloadID() const { return m_downloadID; }
+private:
+ uint64_t m_downloadID { 0 };
+};
+
+}
+
+namespace IPC {
+
+template<> struct ArgumentCoder<WebKit::DownloadID> {
+ static void encode(ArgumentEncoder& encoder, const WebKit::DownloadID& downloadID)
+ {
+ encoder << downloadID.downloadID();
+ }
+ static bool decode(ArgumentDecoder& decoder, WebKit::DownloadID& downloadID)
+ {
+ uint64_t id;
+ if (!decoder.decode(id))
+ return false;
+
+ downloadID = WebKit::DownloadID(id);
+
+ return true;
+ }
+};
+
+}
+
+namespace WTF {
+
+struct DownloadIDHash {
+ static unsigned hash(const WebKit::DownloadID& d) { return intHash(d.downloadID()); }
+ static bool equal(const WebKit::DownloadID& a, const WebKit::DownloadID& b) { return a.downloadID() == b.downloadID(); }
+ static const bool safeToCompareToEmptyOrDeleted = true;
+};
+template<> struct HashTraits<WebKit::DownloadID> : GenericHashTraits<WebKit::DownloadID> {
+ static WebKit::DownloadID emptyValue() { return { }; }
+
+ static void constructDeletedValue(WebKit::DownloadID& slot) { slot = WebKit::DownloadID(std::numeric_limits<uint64_t>::max()); }
+ static bool isDeletedValue(const WebKit::DownloadID& slot) { return slot.downloadID() == std::numeric_limits<uint64_t>::max(); }
+};
+template<> struct DefaultHash<WebKit::DownloadID> {
+ typedef DownloadIDHash Hash;
+};
+
+}
+#endif /* DownloadID_h */
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadManager::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
</del><ins>+void DownloadManager::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> auto* networkSession = SessionTracker::networkSession(sessionID);
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><del>-void DownloadManager::convertHandleToDownload(uint64_t downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
</del><ins>+void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request);
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void DownloadManager::resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
</del><ins>+void DownloadManager::resumeDownload(SessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
</ins><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadManager::cancelDownload(uint64_t downloadID)
</del><ins>+void DownloadManager::cancelDownload(DownloadID downloadID)
</ins><span class="cx"> {
</span><span class="cx"> Download* download = m_downloads.get(downloadID);
</span><span class="cx"> if (!download)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DownloadManager_h
</span><span class="cx"> #define DownloadManager_h
</span><span class="cx">
</span><ins>+#include "Download.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -69,14 +70,14 @@
</span><span class="cx">
</span><span class="cx"> explicit DownloadManager(Client*);
</span><span class="cx">
</span><del>- void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
</del><ins>+ void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
</ins><span class="cx"> #if !USE(NETWORK_SESSION)
</span><del>- void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</del><ins>+ void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</del><ins>+ void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
</ins><span class="cx">
</span><del>- void cancelDownload(uint64_t downloadID);
</del><ins>+ void cancelDownload(DownloadID);
</ins><span class="cx">
</span><span class="cx"> void downloadFinished(Download*);
</span><span class="cx"> bool isDownloading() const { return !m_downloads.isEmpty(); }
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Client* m_client;
</span><del>- HashMap<uint64_t, std::unique_ptr<Download>> m_downloads;
</del><ins>+ HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t WKDownloadGetID(WKDownloadRef download)
</span><span class="cx"> {
</span><del>- return toImpl(download)->downloadID();
</del><ins>+ return toImpl(download)->downloadID().downloadID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRequestRef WKDownloadCopyRequest(WKDownloadRef download)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebProcessPool&, const WebCore::ResourceRequest&);
</span><span class="cx"> ~DownloadProxy();
</span><span class="cx">
</span><del>- uint64_t downloadID() const { return m_downloadID; }
</del><ins>+ DownloadID downloadID() const { return m_downloadID; }
</ins><span class="cx"> const WebCore::ResourceRequest& request() const { return m_request; }
</span><span class="cx"> API::Data* resumeData() const { return m_resumeData.get(); }
</span><span class="cx">
</span><span class="lines">@@ -87,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxyMap& m_downloadProxyMap;
</span><span class="cx"> RefPtr<WebProcessPool> m_processPool;
</span><del>- uint64_t m_downloadID;
</del><ins>+ DownloadID m_downloadID;
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Data> m_resumeData;
</span><span class="cx"> WebCore::ResourceRequest m_request;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -49,18 +49,18 @@
</span><span class="cx"> RefPtr<DownloadProxy> downloadProxy = DownloadProxy::create(*this, processPool, resourceRequest);
</span><span class="cx"> m_downloads.set(downloadProxy->downloadID(), downloadProxy);
</span><span class="cx">
</span><del>- m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID(), *downloadProxy);
</del><ins>+ m_process->addMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID().downloadID(), *downloadProxy);
</ins><span class="cx">
</span><span class="cx"> return downloadProxy.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DownloadProxyMap::downloadFinished(DownloadProxy* downloadProxy)
</span><span class="cx"> {
</span><del>- uint64_t downloadID = downloadProxy->downloadID();
</del><ins>+ auto downloadID = downloadProxy->downloadID();
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_downloads.contains(downloadID));
</span><span class="cx">
</span><del>- m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadID);
</del><ins>+ m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadID.downloadID());
</ins><span class="cx"> downloadProxy->invalidate();
</span><span class="cx"> m_downloads.remove(downloadID);
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> void DownloadProxyMap::processDidClose()
</span><span class="cx"> {
</span><span class="cx"> // Invalidate all outstanding downloads.
</span><del>- for (HashMap<uint64_t, RefPtr<DownloadProxy>>::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
</del><ins>+ for (auto it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
</ins><span class="cx"> (*it)->processDidClose();
</span><span class="cx"> (*it)->invalidate();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DownloadProxyMap_h
</span><span class="cx"> #define DownloadProxyMap_h
</span><span class="cx">
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ChildProcessProxy* m_process;
</span><del>- HashMap<uint64_t, RefPtr<DownloadProxy>> m_downloads;
</del><ins>+ HashMap<DownloadID, RefPtr<DownloadProxy>> m_downloads;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -2015,7 +2015,7 @@
</span><span class="cx"> if (action == PolicyIgnore)
</span><span class="cx"> m_pageLoadState.clearPendingAPIRequestURL(transaction);
</span><span class="cx">
</span><del>- uint64_t downloadID = 0;
</del><ins>+ DownloadID downloadID = { };
</ins><span class="cx"> if (action == PolicyDownload) {
</span><span class="cx"> // Create a download proxy.
</span><span class="cx"> // FIXME: We should ensure that the downloadRequest is never empty.
</span><span class="lines">@@ -3250,7 +3250,7 @@
</span><span class="cx"> m_frameSetLargestFrame = value ? m_mainFrame : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID)
</del><ins>+void WebPageProxy::decidePolicyForNavigationAction(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData& navigationActionData, uint64_t originatingFrameID, const SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const ResourceRequest& request, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, DownloadID& downloadID)
</ins><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="lines">@@ -3359,7 +3359,7 @@
</span><span class="cx"> m_policyClient->decidePolicyForResponse(*this, *frame, response, request, canShowMIMEType, WTF::move(listener), m_process->transformHandlesToObjects(userData.object()).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID)
</del><ins>+void WebPageProxy::decidePolicyForResponseSync(uint64_t frameID, const SecurityOriginData& frameSecurityOrigin, const ResourceResponse& response, const ResourceRequest& request, bool canShowMIMEType, uint64_t listenerID, const UserData& userData, bool& receivedPolicyAction, uint64_t& policyAction, DownloadID& downloadID)
</ins><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "AutoCorrectionCallback.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "ContextMenuContextData.h"
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "DragControllerAction.h"
</span><span class="cx"> #include "DrawingAreaProxy.h"
</span><span class="cx"> #include "EditingRange.h"
</span><span class="lines">@@ -1133,10 +1134,10 @@
</span><span class="cx">
</span><span class="cx"> void didDestroyNavigation(uint64_t navigationID);
</span><span class="cx">
</span><del>- void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, uint64_t& downloadID);
</del><ins>+ void decidePolicyForNavigationAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const NavigationActionData&, uint64_t originatingFrameID, const WebCore::SecurityOriginData& originatingFrameSecurityOrigin, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest&, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& newNavigationID, uint64_t& policyAction, DownloadID&);
</ins><span class="cx"> void decidePolicyForNewWindowAction(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, uint64_t listenerID, const UserData&);
</span><span class="cx"> void decidePolicyForResponse(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&);
</span><del>- void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
</del><ins>+ void decidePolicyForResponseSync(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, bool canShowMIMEType, uint64_t listenerID, const UserData&, bool& receivedPolicyAction, uint64_t& policyAction, DownloadID&);
</ins><span class="cx"> void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, const UserData&);
</span><span class="cx">
</span><span class="cx"> void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, const UserData&);
</span><span class="lines">@@ -1616,12 +1617,12 @@
</span><span class="cx"> const WebCore::ResourceRequest* m_decidePolicyForResponseRequest;
</span><span class="cx"> bool m_syncMimeTypePolicyActionIsValid;
</span><span class="cx"> WebCore::PolicyAction m_syncMimeTypePolicyAction;
</span><del>- uint64_t m_syncMimeTypePolicyDownloadID;
</del><ins>+ DownloadID m_syncMimeTypePolicyDownloadID;
</ins><span class="cx">
</span><span class="cx"> bool m_inDecidePolicyForNavigationAction;
</span><span class="cx"> bool m_syncNavigationActionPolicyActionIsValid;
</span><span class="cx"> WebCore::PolicyAction m_syncNavigationActionPolicyAction;
</span><del>- uint64_t m_syncNavigationActionPolicyDownloadID;
</del><ins>+ DownloadID m_syncNavigationActionPolicyDownloadID;
</ins><span class="cx"> bool m_shouldSuppressAppLinksInNextNavigationPolicyDecision { false };
</span><span class="cx">
</span><span class="cx"> Deque<NativeWebKeyboardEvent> m_keyEventQueue;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Policy messages
</span><del>- DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, uint64_t downloadID)
- DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebCore::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, uint64_t downloadID)
</del><ins>+ DecidePolicyForResponseSync(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, WebCore::ResourceResponse response, WebCore::ResourceRequest request, bool canShowMIMEType, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t policyAction, WebKit::DownloadID downloadID)
+ DecidePolicyForNavigationAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, struct WebKit::NavigationActionData navigationActionData, uint64_t originatingFrameID, struct WebCore::SecurityOriginData originatingFrameSecurityOrigin, WebCore::ResourceRequest originalRequest, WebCore::ResourceRequest request, uint64_t listenerID, WebKit::UserData userData) -> (bool receivedPolicyAction, uint64_t newNavigationID, uint64_t policyAction, WebKit::DownloadID downloadID)
</ins><span class="cx"> DecidePolicyForNewWindowAction(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, struct WebKit::NavigationActionData navigationActionData, WebCore::ResourceRequest request, String frameName, uint64_t listenerID, WebKit::UserData userData)
</span><span class="cx"> UnableToImplementPolicy(uint64_t frameID, WebCore::ResourceError error, WebKit::UserData userData)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -1064,6 +1064,7 @@
</span><span class="cx"> 5272B28A1406985D0096A5D0 /* StatisticsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5272B2881406985D0096A5D0 /* StatisticsData.cpp */; };
</span><span class="cx"> 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
</span><span class="cx"> 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C0932061C236011007AAA7C /* DownloadID.h */; };
</ins><span class="cx"> 5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */; };
</span><span class="cx"> 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
</span><span class="cx"> 5C9B86131C223EAF00110F36 /* DownloadCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */; };
</span><span class="lines">@@ -3256,6 +3257,7 @@
</span><span class="cx"> 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoader.h; path = NetworkProcess/NetworkResourceLoader.h; sourceTree = "<group>"; };
</span><span class="cx"> 5272B2881406985D0096A5D0 /* StatisticsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
</span><ins>+ 5C0932061C236011007AAA7C /* DownloadID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadID.h; path = Downloads/DownloadID.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkSessionCocoa.mm; path = NetworkProcess/cocoa/NetworkSessionCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
</span><span class="cx"> 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadCocoa.mm; path = Downloads/cocoa/DownloadCocoa.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -5745,6 +5747,7 @@
</span><span class="cx"> 518E8EF216B208F800E91429 /* Downloads */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5C0932061C236011007AAA7C /* DownloadID.h */,
</ins><span class="cx"> 5C9B860E1C223E5400110F36 /* cocoa */,
</span><span class="cx"> 2DA944A51884E93C00ED86DB /* ios */,
</span><span class="cx"> 518E8F0416B2093700E91429 /* mac */,
</span><span class="lines">@@ -8312,6 +8315,7 @@
</span><span class="cx"> BCB9F6A51123DD0D00A137E0 /* WKFramePolicyListener.h in Headers */,
</span><span class="cx"> E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */,
</span><span class="cx"> CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */,
</span><ins>+ 5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */,
</ins><span class="cx"> BC54CC1212D674EE005C67B0 /* WKGeolocationManager.h in Headers */,
</span><span class="cx"> BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,
</span><span class="cx"> BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> uint64_t listenerID = m_frame->setUpPolicyListener(WTF::move(function));
</span><span class="cx"> bool receivedPolicyAction;
</span><span class="cx"> uint64_t policyAction;
</span><del>- uint64_t downloadID;
</del><ins>+ DownloadID downloadID;
</ins><span class="cx">
</span><span class="cx"> unsigned syncSendFlags = IPC::InformPlatformProcessWillSuspend;
</span><span class="cx"> if (WebPage::synchronousMessagesShouldSpinRunLoop())
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::Frame* coreFrame = m_frame ? m_frame->coreFrame() : nullptr;
</span><span class="cx"> if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), response, request, canShowMIMEType, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags)) {
</span><del>- m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, 0);
</del><ins>+ m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, { });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -775,7 +775,7 @@
</span><span class="cx"> bool receivedPolicyAction;
</span><span class="cx"> uint64_t newNavigationID;
</span><span class="cx"> uint64_t policyAction;
</span><del>- uint64_t downloadID;
</del><ins>+ DownloadID downloadID;
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebFrame> originatingFrame;
</span><span class="cx"> switch (action->navigationType()) {
</span><span class="lines">@@ -814,7 +814,7 @@
</span><span class="cx"> // Notify the UIProcess.
</span><span class="cx"> WebCore::Frame* originatingCoreFrame = originatingFrame ? originatingFrame->coreFrame() : nullptr;
</span><span class="cx"> if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForNavigationAction(m_frame->frameID(), SecurityOriginData::fromFrame(coreFrame), documentLoader->navigationID(), navigationActionData, originatingFrame ? originatingFrame->frameID() : 0, SecurityOriginData::fromFrame(originatingCoreFrame), navigationAction.resourceRequest(), request, listenerID, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())), Messages::WebPageProxy::DecidePolicyForNavigationAction::Reply(receivedPolicyAction, newNavigationID, policyAction, downloadID))) {
</span><del>- m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, 0);
</del><ins>+ m_frame->didReceivePolicyDecision(listenerID, PolicyIgnore, 0, { });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -215,12 +215,12 @@
</span><span class="cx"> if (!m_policyListenerID)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_policyDownloadID = 0;
</del><ins>+ m_policyDownloadID = { };
</ins><span class="cx"> m_policyListenerID = 0;
</span><span class="cx"> m_policyFunction = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, uint64_t downloadID)
</del><ins>+void WebFrame::didReceivePolicyDecision(uint64_t listenerID, PolicyAction action, uint64_t navigationID, DownloadID downloadID)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_coreFrame)
</span><span class="cx"> return;
</span><span class="lines">@@ -248,10 +248,10 @@
</span><span class="cx">
</span><span class="cx"> void WebFrame::startDownload(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><del>- ASSERT(m_policyDownloadID);
</del><ins>+ ASSERT(m_policyDownloadID.downloadID());
</ins><span class="cx">
</span><del>- uint64_t policyDownloadID = m_policyDownloadID;
- m_policyDownloadID = 0;
</del><ins>+ auto policyDownloadID = m_policyDownloadID;
+ m_policyDownloadID = { };
</ins><span class="cx">
</span><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> SessionID sessionID = page() ? page()->sessionID() : SessionID::defaultSessionID();
</span><span class="lines">@@ -260,10 +260,10 @@
</span><span class="cx">
</span><span class="cx"> void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- ASSERT(m_policyDownloadID);
</del><ins>+ ASSERT(m_policyDownloadID.downloadID());
</ins><span class="cx">
</span><del>- uint64_t policyDownloadID = m_policyDownloadID;
- m_policyDownloadID = 0;
</del><ins>+ auto policyDownloadID = m_policyDownloadID;
+ m_policyDownloadID = { };
</ins><span class="cx">
</span><span class="cx"> SubresourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebFrame_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><ins>+#include "DownloadID.h"
</ins><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WKBase.h"
</span><span class="cx"> #include "WebFrameLoaderClient.h"
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t setUpPolicyListener(WebCore::FramePolicyFunction);
</span><span class="cx"> void invalidatePolicyListener();
</span><del>- void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, uint64_t downloadID);
</del><ins>+ void didReceivePolicyDecision(uint64_t listenerID, WebCore::PolicyAction, uint64_t navigationID, DownloadID);
</ins><span class="cx">
</span><span class="cx"> void startDownload(const WebCore::ResourceRequest&);
</span><span class="cx"> void convertMainResourceLoadToDownload(WebCore::DocumentLoader*, WebCore::SessionID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="lines">@@ -170,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t m_policyListenerID;
</span><span class="cx"> WebCore::FramePolicyFunction m_policyFunction;
</span><del>- uint64_t m_policyDownloadID;
</del><ins>+ DownloadID m_policyDownloadID;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebFrameLoaderClient> m_frameLoaderClient;
</span><span class="cx"> LoadListener* m_loadListener;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -2408,7 +2408,7 @@
</span><span class="cx"> m_page->setSessionID(sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
</del><ins>+void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID downloadID)
</ins><span class="cx"> {
</span><span class="cx"> WebFrame* frame = WebProcess::singleton().webFrame(frameID);
</span><span class="cx"> if (!frame)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "APIInjectedBundlePageContextMenuClient.h"
</span><span class="cx"> #include "APIInjectedBundlePageUIClient.h"
</span><span class="cx"> #include "APIObject.h"
</span><ins>+#include "Download.h"
</ins><span class="cx"> #include "FindController.h"
</span><span class="cx"> #include "GeolocationPermissionRequestManager.h"
</span><span class="cx"> #include "ImageOptions.h"
</span><span class="lines">@@ -1043,7 +1044,7 @@
</span><span class="cx"> void platformPreferencesDidChange(const WebPreferencesStore&);
</span><span class="cx"> void updatePreferences(const WebPreferencesStore&);
</span><span class="cx">
</span><del>- void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID);
</del><ins>+ void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID);
</ins><span class="cx"> void setUserAgent(const String&);
</span><span class="cx"> void setCustomTextEncodingName(const String&);
</span><span class="cx"> void suspendActiveDOMObjectsAndAnimations();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (194263 => 194264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-12-18 07:06:11 UTC (rev 194263)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-12-18 08:10:53 UTC (rev 194264)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> DidRemoveBackForwardItem(uint64_t backForwardItemID)
</span><span class="cx">
</span><del>- DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, uint64_t downloadID)
</del><ins>+ DidReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, WebKit::DownloadID downloadID)
</ins><span class="cx">
</span><span class="cx"> ClearSelection()
</span><span class="cx"> RestoreSelectionInFocusedEditableElement()
</span></span></pre>
</div>
</div>
</body>
</html>