<!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>[194272] 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/194272">194272</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-12-18 10:08:05 -0800 (Fri, 18 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move networking code from Shared to NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=152421
Reviewed by Antti Koivisto.
Since recently removing the non-NetworkProcess configurations, this code is no longer shared with the WebProcess.
* CMakeLists.txt:
* DerivedSources.make:
* NetworkProcess/CustomProtocols: Copied from Source/WebKit2/Shared/Network/CustomProtocols.
* NetworkProcess/Downloads: Copied from Source/WebKit2/Shared/Downloads.
* NetworkProcess/Downloads/Download.cpp: Copied from Source/WebKit2/Shared/Downloads/Download.cpp.
* NetworkProcess/Downloads/Download.h: Copied from Source/WebKit2/Shared/Downloads/Download.h.
* NetworkProcess/Downloads/DownloadID.h: Copied from Source/WebKit2/Shared/Downloads/DownloadID.h.
* NetworkProcess/Downloads/DownloadManager.cpp: Copied from Source/WebKit2/Shared/Downloads/DownloadManager.cpp.
* NetworkProcess/Downloads/DownloadManager.h: Copied from Source/WebKit2/Shared/Downloads/DownloadManager.h.
* NetworkProcess/NetworkProcessCreationParameters.cpp: Copied from Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp.
* NetworkProcess/NetworkProcessCreationParameters.h: Copied from Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h.
* NetworkProcess/NetworkProcessSupplement.h: Copied from Source/WebKit2/Shared/Network/NetworkProcessSupplement.h.
* NetworkProcess/NetworkResourceLoadParameters.cpp: Copied from Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp.
* NetworkProcess/NetworkResourceLoadParameters.h: Copied from Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h.
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* Shared/Downloads: Removed.
* Shared/Downloads/Download.cpp: Removed.
* Shared/Downloads/Download.h: Removed.
* Shared/Downloads/DownloadAuthenticationClient.cpp: Removed.
* Shared/Downloads/DownloadAuthenticationClient.h: Removed.
* Shared/Downloads/DownloadID.h: Removed.
* Shared/Downloads/DownloadManager.cpp: Removed.
* Shared/Downloads/DownloadManager.h: Removed.
* Shared/Downloads/cocoa: Removed.
* Shared/Downloads/cocoa/DownloadCocoa.mm: Removed.
* Shared/Downloads/efl: Removed.
* Shared/Downloads/efl/DownloadSoupErrorsEfl.cpp: Removed.
* Shared/Downloads/gtk: Removed.
* Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp: Removed.
* Shared/Downloads/ios: Removed.
* Shared/Downloads/ios/DownloadIOS.mm: Removed.
* Shared/Downloads/mac: Removed.
* Shared/Downloads/mac/DownloadMac.mm: Removed.
* Shared/Downloads/soup: Removed.
* Shared/Downloads/soup/DownloadSoup.cpp: Removed.
* Shared/Downloads/soup/DownloadSoupErrors.h: Removed.
* Shared/Network: Removed.
* Shared/Network/CustomProtocols: Removed.
* Shared/Network/CustomProtocols/Cocoa: Removed.
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Removed.
* Shared/Network/CustomProtocols/CustomProtocolManager.h: Removed.
* Shared/Network/CustomProtocols/CustomProtocolManager.messages.in: Removed.
* Shared/Network/CustomProtocols/soup: Removed.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp: Removed.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h: Removed.
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Removed.
* Shared/Network/NetworkProcessCreationParameters.cpp: Removed.
* Shared/Network/NetworkProcessCreationParameters.h: Removed.
* Shared/Network/NetworkProcessSupplement.h: Removed.
* Shared/Network/NetworkResourceLoadParameters.cpp: Removed.
* Shared/Network/NetworkResourceLoadParameters.h: Removed.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/NetworkProcess/CustomProtocols/</li>
<li>trunk/Source/WebKit2/NetworkProcess/Downloads/</li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadIDh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadID.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessSupplementh">trunk/Source/WebKit2/NetworkProcess/NetworkProcessSupplement.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadParameterscpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li>trunk/Source/WebKit2/Shared/Downloads/</li>
<li>trunk/Source/WebKit2/Shared/Network/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -5,6 +5,8 @@
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB"
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/IndexedDB/sqlite"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols"
+ "${WEBKIT2_DIR}/NetworkProcess/Downloads"
</ins><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/FileAPI"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/cache"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform"
</span><span class="lines">@@ -17,10 +19,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/CoreIPCSupport"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Databases"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Databases/IndexedDB"
</span><del>- "${WEBKIT2_DIR}/Shared/Downloads"
</del><span class="cx"> "${WEBKIT2_DIR}/Shared/FileAPI"
</span><del>- "${WEBKIT2_DIR}/Shared/Network"
- "${WEBKIT2_DIR}/Shared/Network/CustomProtocols"
</del><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/Netscape"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/Netscape/x11"
</span><span class="lines">@@ -199,6 +198,13 @@
</span><span class="cx"> DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
</span><span class="cx"> DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
</span><span class="cx">
</span><ins>+ NetworkProcess/NetworkProcessCreationParameters.cpp
+ NetworkProcess/NetworkResourceLoadParameters.cpp
+
+ NetworkProcess/Downloads/Download.cpp
+ NetworkProcess/Downloads/DownloadAuthenticationClient.cpp
+ NetworkProcess/Downloads/DownloadManager.cpp
+
</ins><span class="cx"> Platform/Logging.cpp
</span><span class="cx"> Platform/Module.cpp
</span><span class="cx">
</span><span class="lines">@@ -317,13 +323,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/Databases/IndexedDB/IDBUtilities.cpp
</span><span class="cx">
</span><del>- Shared/Downloads/Download.cpp
- Shared/Downloads/DownloadAuthenticationClient.cpp
- Shared/Downloads/DownloadManager.cpp
-
- Shared/Network/NetworkProcessCreationParameters.cpp
- Shared/Network/NetworkResourceLoadParameters.cpp
-
</del><span class="cx"> Shared/Plugins/NPIdentifierData.cpp
</span><span class="cx"> Shared/Plugins/NPObjectMessageReceiver.cpp
</span><span class="cx"> Shared/Plugins/NPObjectProxy.cpp
</span><span class="lines">@@ -646,6 +645,8 @@
</span><span class="cx">
</span><span class="cx"> DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
</span><span class="cx">
</span><ins>+ NetworkProcess/CustomProtocols/CustomProtocolManager.messages.in
+
</ins><span class="cx"> NetworkProcess/NetworkConnectionToWebProcess.messages.in
</span><span class="cx"> NetworkProcess/NetworkProcess.messages.in
</span><span class="cx"> NetworkProcess/NetworkResourceLoader.messages.in
</span><span class="lines">@@ -659,8 +660,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/Authentication/AuthenticationManager.messages.in
</span><span class="cx">
</span><del>- Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
-
</del><span class="cx"> Shared/Plugins/NPObjectMessageReceiver.messages.in
</span><span class="cx">
</span><span class="cx"> UIProcess/DrawingAreaProxy.messages.in
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2015-12-18 Alex Christensen <achristensen@webkit.org>
+
+ Move networking code from Shared to NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=152421
+
+ Reviewed by Antti Koivisto.
+
+ Since recently removing the non-NetworkProcess configurations, this code is no longer shared with the WebProcess.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * NetworkProcess/CustomProtocols: Copied from Source/WebKit2/Shared/Network/CustomProtocols.
+ * NetworkProcess/Downloads: Copied from Source/WebKit2/Shared/Downloads.
+ * NetworkProcess/Downloads/Download.cpp: Copied from Source/WebKit2/Shared/Downloads/Download.cpp.
+ * NetworkProcess/Downloads/Download.h: Copied from Source/WebKit2/Shared/Downloads/Download.h.
+ * NetworkProcess/Downloads/DownloadID.h: Copied from Source/WebKit2/Shared/Downloads/DownloadID.h.
+ * NetworkProcess/Downloads/DownloadManager.cpp: Copied from Source/WebKit2/Shared/Downloads/DownloadManager.cpp.
+ * NetworkProcess/Downloads/DownloadManager.h: Copied from Source/WebKit2/Shared/Downloads/DownloadManager.h.
+ * NetworkProcess/NetworkProcessCreationParameters.cpp: Copied from Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp.
+ * NetworkProcess/NetworkProcessCreationParameters.h: Copied from Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h.
+ * NetworkProcess/NetworkProcessSupplement.h: Copied from Source/WebKit2/Shared/Network/NetworkProcessSupplement.h.
+ * NetworkProcess/NetworkResourceLoadParameters.cpp: Copied from Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp.
+ * NetworkProcess/NetworkResourceLoadParameters.h: Copied from Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h.
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * Shared/Downloads: Removed.
+ * Shared/Downloads/Download.cpp: Removed.
+ * Shared/Downloads/Download.h: Removed.
+ * Shared/Downloads/DownloadAuthenticationClient.cpp: Removed.
+ * Shared/Downloads/DownloadAuthenticationClient.h: Removed.
+ * Shared/Downloads/DownloadID.h: Removed.
+ * Shared/Downloads/DownloadManager.cpp: Removed.
+ * Shared/Downloads/DownloadManager.h: Removed.
+ * Shared/Downloads/cocoa: Removed.
+ * Shared/Downloads/cocoa/DownloadCocoa.mm: Removed.
+ * Shared/Downloads/efl: Removed.
+ * Shared/Downloads/efl/DownloadSoupErrorsEfl.cpp: Removed.
+ * Shared/Downloads/gtk: Removed.
+ * Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp: Removed.
+ * Shared/Downloads/ios: Removed.
+ * Shared/Downloads/ios/DownloadIOS.mm: Removed.
+ * Shared/Downloads/mac: Removed.
+ * Shared/Downloads/mac/DownloadMac.mm: Removed.
+ * Shared/Downloads/soup: Removed.
+ * Shared/Downloads/soup/DownloadSoup.cpp: Removed.
+ * Shared/Downloads/soup/DownloadSoupErrors.h: Removed.
+ * Shared/Network: Removed.
+ * Shared/Network/CustomProtocols: Removed.
+ * Shared/Network/CustomProtocols/Cocoa: Removed.
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Removed.
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h: Removed.
+ * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in: Removed.
+ * Shared/Network/CustomProtocols/soup: Removed.
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp: Removed.
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h: Removed.
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp: Removed.
+ * Shared/Network/NetworkProcessCreationParameters.cpp: Removed.
+ * Shared/Network/NetworkProcessCreationParameters.h: Removed.
+ * Shared/Network/NetworkProcessSupplement.h: Removed.
+ * Shared/Network/NetworkResourceLoadParameters.cpp: Removed.
+ * Shared/Network/NetworkResourceLoadParameters.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-12-18 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> LayerTreeHostGtk triggers -Wunused-private-field
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DerivedSources.make 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/DerivedSources.make 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> $(WebKit2)/DatabaseProcess/IndexedDB \
</span><span class="cx"> $(WebKit2)/DatabaseProcess/mac \
</span><span class="cx"> $(WebKit2)/NetworkProcess \
</span><ins>+ $(WebKit2)/NetworkProcess/CustomProtocols \
</ins><span class="cx"> $(WebKit2)/NetworkProcess/mac \
</span><span class="cx"> $(WebKit2)/PluginProcess \
</span><span class="cx"> $(WebKit2)/PluginProcess/mac \
</span><span class="lines">@@ -33,7 +34,6 @@
</span><span class="cx"> $(WebKit2)/Shared \
</span><span class="cx"> $(WebKit2)/Shared/API/Cocoa \
</span><span class="cx"> $(WebKit2)/Shared/Authentication \
</span><del>- $(WebKit2)/Shared/Network/CustomProtocols \
</del><span class="cx"> $(WebKit2)/Shared/mac \
</span><span class="cx"> $(WebKit2)/WebProcess/ApplicationCache \
</span><span class="cx"> $(WebKit2)/WebProcess/Cookies \
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (194263 => 194272)</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/NetworkProcess/Downloads/Download.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,168 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010, 2011 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.
- */
-
-#include "config.h"
-#include "Download.h"
-
-#include "AuthenticationManager.h"
-#include "Connection.h"
-#include "DataReference.h"
-#include "DownloadProxyMessages.h"
-#include "DownloadManager.h"
-#include "SandboxExtension.h"
-#include "WebCoreArgumentCoders.h"
-#include <WebCore/NotImplemented.h>
-
-#if !USE(NETWORK_SESSION)
-#include "DownloadAuthenticationClient.h"
-#endif
-
-using namespace WebCore;
-
-namespace WebKit {
-
-#if USE(NETWORK_SESSION)
-Download::Download(DownloadManager& downloadManager, const NetworkSession& session, uint64_t downloadID, const ResourceRequest& request)
-#else
-Download::Download(DownloadManager& downloadManager, uint64_t downloadID, const ResourceRequest& request)
-#endif
- : m_downloadManager(downloadManager)
- , m_downloadID(downloadID)
- , m_request(request)
-#if USE(NETWORK_SESSION)
- , m_session(session)
-#endif
-{
- ASSERT(m_downloadID);
-
- m_downloadManager.didCreateDownload();
-}
-
-Download::~Download()
-{
- platformInvalidate();
-
- m_downloadManager.didDestroyDownload();
-}
-
-void Download::didStart()
-{
- send(Messages::DownloadProxy::DidStart(m_request));
-}
-
-void Download::didReceiveAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge)
-{
-#if USE(NETWORK_SESSION)
- notImplemented();
-#else
- m_downloadManager.downloadsAuthenticationManager().didReceiveAuthenticationChallenge(*this, authenticationChallenge);
-#endif
-}
-
-void Download::didReceiveResponse(const ResourceResponse& response)
-{
- send(Messages::DownloadProxy::DidReceiveResponse(response));
-}
-
-void Download::didReceiveData(uint64_t length)
-{
- send(Messages::DownloadProxy::DidReceiveData(length));
-}
-
-bool Download::shouldDecodeSourceDataOfMIMEType(const String& mimeType)
-{
- bool result;
- if (!sendSync(Messages::DownloadProxy::ShouldDecodeSourceDataOfMIMEType(mimeType), Messages::DownloadProxy::ShouldDecodeSourceDataOfMIMEType::Reply(result)))
- return true;
-
- return result;
-}
-
-String Download::decideDestinationWithSuggestedFilename(const String& filename, bool& allowOverwrite)
-{
- String destination;
- SandboxExtension::Handle sandboxExtensionHandle;
- if (!sendSync(Messages::DownloadProxy::DecideDestinationWithSuggestedFilename(filename), Messages::DownloadProxy::DecideDestinationWithSuggestedFilename::Reply(destination, allowOverwrite, sandboxExtensionHandle)))
- return String();
-
- m_sandboxExtension = SandboxExtension::create(sandboxExtensionHandle);
- if (m_sandboxExtension)
- m_sandboxExtension->consume();
-
- return destination;
-}
-
-void Download::didCreateDestination(const String& path)
-{
- send(Messages::DownloadProxy::DidCreateDestination(path));
-}
-
-void Download::didFinish()
-{
- platformDidFinish();
-
- send(Messages::DownloadProxy::DidFinish());
-
- if (m_sandboxExtension) {
- m_sandboxExtension->revoke();
- m_sandboxExtension = nullptr;
- }
-
- m_downloadManager.downloadFinished(this);
-}
-
-void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
-{
- send(Messages::DownloadProxy::DidFail(error, resumeData));
-
- if (m_sandboxExtension) {
- m_sandboxExtension->revoke();
- m_sandboxExtension = nullptr;
- }
- m_downloadManager.downloadFinished(this);
-}
-
-void Download::didCancel(const IPC::DataReference& resumeData)
-{
- send(Messages::DownloadProxy::DidCancel(resumeData));
-
- if (m_sandboxExtension) {
- m_sandboxExtension->revoke();
- m_sandboxExtension = nullptr;
- }
- m_downloadManager.downloadFinished(this);
-}
-
-IPC::Connection* Download::messageSenderConnection()
-{
- return m_downloadManager.downloadProxyConnection();
-}
-
-uint64_t Download::messageSenderDestinationID()
-{
- return m_downloadID;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcppfromrev194264trunkSourceWebKit2SharedDownloadsDownloadcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (from rev 194264, trunk/Source/WebKit2/Shared/Downloads/Download.cpp) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2011 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.
+ */
+
+#include "config.h"
+#include "Download.h"
+
+#include "AuthenticationManager.h"
+#include "Connection.h"
+#include "DataReference.h"
+#include "DownloadManager.h"
+#include "DownloadProxyMessages.h"
+#include "SandboxExtension.h"
+#include "WebCoreArgumentCoders.h"
+#include <WebCore/NotImplemented.h>
+
+#if !USE(NETWORK_SESSION)
+#include "DownloadAuthenticationClient.h"
+#endif
+
+using namespace WebCore;
+
+namespace WebKit {
+
+#if USE(NETWORK_SESSION)
+Download::Download(DownloadManager& downloadManager, const NetworkSession& session, DownloadID downloadID, const ResourceRequest& request)
+#else
+Download::Download(DownloadManager& downloadManager, DownloadID downloadID, const ResourceRequest& request)
+#endif
+ : m_downloadManager(downloadManager)
+ , m_downloadID(downloadID)
+ , m_request(request)
+#if USE(NETWORK_SESSION)
+ , m_session(session)
+#endif
+{
+ ASSERT(m_downloadID.downloadID());
+
+ m_downloadManager.didCreateDownload();
+}
+
+Download::~Download()
+{
+ platformInvalidate();
+
+ m_downloadManager.didDestroyDownload();
+}
+
+void Download::didStart()
+{
+ send(Messages::DownloadProxy::DidStart(m_request));
+}
+
+void Download::didReceiveAuthenticationChallenge(const AuthenticationChallenge& authenticationChallenge)
+{
+#if USE(NETWORK_SESSION)
+ notImplemented();
+#else
+ m_downloadManager.downloadsAuthenticationManager().didReceiveAuthenticationChallenge(*this, authenticationChallenge);
+#endif
+}
+
+void Download::didReceiveResponse(const ResourceResponse& response)
+{
+ send(Messages::DownloadProxy::DidReceiveResponse(response));
+}
+
+void Download::didReceiveData(uint64_t length)
+{
+ send(Messages::DownloadProxy::DidReceiveData(length));
+}
+
+bool Download::shouldDecodeSourceDataOfMIMEType(const String& mimeType)
+{
+ bool result;
+ if (!sendSync(Messages::DownloadProxy::ShouldDecodeSourceDataOfMIMEType(mimeType), Messages::DownloadProxy::ShouldDecodeSourceDataOfMIMEType::Reply(result)))
+ return true;
+
+ return result;
+}
+
+String Download::decideDestinationWithSuggestedFilename(const String& filename, bool& allowOverwrite)
+{
+ String destination;
+ SandboxExtension::Handle sandboxExtensionHandle;
+ if (!sendSync(Messages::DownloadProxy::DecideDestinationWithSuggestedFilename(filename), Messages::DownloadProxy::DecideDestinationWithSuggestedFilename::Reply(destination, allowOverwrite, sandboxExtensionHandle)))
+ return String();
+
+ m_sandboxExtension = SandboxExtension::create(sandboxExtensionHandle);
+ if (m_sandboxExtension)
+ m_sandboxExtension->consume();
+
+ return destination;
+}
+
+void Download::didCreateDestination(const String& path)
+{
+ send(Messages::DownloadProxy::DidCreateDestination(path));
+}
+
+void Download::didFinish()
+{
+ platformDidFinish();
+
+ send(Messages::DownloadProxy::DidFinish());
+
+ if (m_sandboxExtension) {
+ m_sandboxExtension->revoke();
+ m_sandboxExtension = nullptr;
+ }
+
+ m_downloadManager.downloadFinished(this);
+}
+
+void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
+{
+ send(Messages::DownloadProxy::DidFail(error, resumeData));
+
+ if (m_sandboxExtension) {
+ m_sandboxExtension->revoke();
+ m_sandboxExtension = nullptr;
+ }
+ m_downloadManager.downloadFinished(this);
+}
+
+void Download::didCancel(const IPC::DataReference& resumeData)
+{
+ send(Messages::DownloadProxy::DidCancel(resumeData));
+
+ if (m_sandboxExtension) {
+ m_sandboxExtension->revoke();
+ m_sandboxExtension = nullptr;
+ }
+ m_downloadManager.downloadFinished(this);
+}
+
+IPC::Connection* Download::messageSenderConnection()
+{
+ return m_downloadManager.downloadProxyConnection();
+}
+
+uint64_t Download::messageSenderDestinationID()
+{
+ return m_downloadID.downloadID();
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (194263 => 194272)</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/NetworkProcess/Downloads/Download.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,157 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010, 2011 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 Download_h
-#define Download_h
-
-#include "MessageSender.h"
-#include "SandboxExtension.h"
-#include <WebCore/ResourceRequest.h>
-#include <wtf/Noncopyable.h>
-
-#if PLATFORM(COCOA)
-#include <wtf/RetainPtr.h>
-
-#if USE(NETWORK_SESSION)
-OBJC_CLASS NSURLSessionDownloadTask;
-#else
-OBJC_CLASS NSURLDownload;
-OBJC_CLASS WKDownloadAsDelegate;
-#endif
-#endif
-
-#if PLATFORM(GTK) || PLATFORM(EFL)
-#include <WebCore/ResourceHandle.h>
-#include <WebCore/ResourceHandleClient.h>
-#include <memory>
-#endif
-
-#if USE(CFNETWORK)
-#include <CFNetwork/CFURLDownloadPriv.h>
-#endif
-
-namespace IPC {
-class DataReference;
-}
-
-namespace WebCore {
-class AuthenticationChallenge;
-class Credential;
-class ResourceError;
-class ResourceHandle;
-class ResourceResponse;
-}
-
-namespace WebKit {
-
-class DownloadAuthenticationClient;
-class DownloadManager;
-class NetworkDataTask;
-class NetworkSession;
-class WebPage;
-
-class Download : public IPC::MessageSender {
- WTF_MAKE_NONCOPYABLE(Download);
-public:
-#if USE(NETWORK_SESSION)
- Download(DownloadManager&, const NetworkSession&, uint64_t downloadID, const WebCore::ResourceRequest&);
-#else
- Download(DownloadManager&, uint64_t downloadID, const WebCore::ResourceRequest&);
-#endif
- ~Download();
-
- void start();
-#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
- void dataTaskDidBecomeDownloadTask(const NetworkSession&, RetainPtr<NSURLSessionDownloadTask>&&);
-#else
- void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
-#endif
- void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
- void cancel();
-
- uint64_t downloadID() const { return m_downloadID; }
-
- void didStart();
- void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
- void didReceiveResponse(const WebCore::ResourceResponse&);
- void didReceiveData(uint64_t length);
- bool shouldDecodeSourceDataOfMIMEType(const String& mimeType);
- String decideDestinationWithSuggestedFilename(const String& filename, bool& allowOverwrite);
- void didCreateDestination(const String& path);
- void didFinish();
- void platformDidFinish();
- void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
- void didCancel(const IPC::DataReference& resumeData);
-
-#if USE(CFNETWORK)
- DownloadAuthenticationClient* authenticationClient();
-#endif
-
- // Authentication
- static void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
- static void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
- static void receivedCancellation(const WebCore::AuthenticationChallenge&);
- static void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&);
- static void receivedChallengeRejection(const WebCore::AuthenticationChallenge&);
-
- void useCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
- void continueWithoutCredential(const WebCore::AuthenticationChallenge&);
- void cancelAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
-
-private:
- // IPC::MessageSender
- virtual IPC::Connection* messageSenderConnection() override;
- virtual uint64_t messageSenderDestinationID() override;
-
- void platformInvalidate();
-
- DownloadManager& m_downloadManager;
- uint64_t m_downloadID;
- WebCore::ResourceRequest m_request;
-
- RefPtr<SandboxExtension> m_sandboxExtension;
-
-#if PLATFORM(COCOA)
-#if USE(NETWORK_SESSION)
- const NetworkSession& m_session;
- RetainPtr<NSURLSessionDownloadTask> m_download;
-#else
- RetainPtr<NSURLDownload> m_nsURLDownload;
- RetainPtr<WKDownloadAsDelegate> m_delegate;
-#endif
-#endif
-#if USE(CFNETWORK)
- RetainPtr<CFURLDownloadRef> m_download;
- RefPtr<DownloadAuthenticationClient> m_authenticationClient;
-#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
- std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient;
- RefPtr<WebCore::ResourceHandle> m_resourceHandle;
-#endif
-};
-
-} // namespace WebKit
-
-#endif // Download_h
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadhfromrev194264trunkSourceWebKit2SharedDownloadsDownloadh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (from rev 194264, trunk/Source/WebKit2/Shared/Downloads/Download.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,158 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2011 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 Download_h
+#define Download_h
+
+#include "DownloadID.h"
+#include "MessageSender.h"
+#include "SandboxExtension.h"
+#include <WebCore/ResourceRequest.h>
+#include <wtf/Noncopyable.h>
+
+#if PLATFORM(COCOA)
+#include <wtf/RetainPtr.h>
+
+#if USE(NETWORK_SESSION)
+OBJC_CLASS NSURLSessionDownloadTask;
+#else
+OBJC_CLASS NSURLDownload;
+OBJC_CLASS WKDownloadAsDelegate;
+#endif
+#endif
+
+#if PLATFORM(GTK) || PLATFORM(EFL)
+#include <WebCore/ResourceHandle.h>
+#include <WebCore/ResourceHandleClient.h>
+#include <memory>
+#endif
+
+#if USE(CFNETWORK)
+#include <CFNetwork/CFURLDownloadPriv.h>
+#endif
+
+namespace IPC {
+class DataReference;
+}
+
+namespace WebCore {
+class AuthenticationChallenge;
+class Credential;
+class ResourceError;
+class ResourceHandle;
+class ResourceResponse;
+}
+
+namespace WebKit {
+
+class DownloadAuthenticationClient;
+class DownloadManager;
+class NetworkDataTask;
+class NetworkSession;
+class WebPage;
+
+class Download : public IPC::MessageSender {
+ WTF_MAKE_NONCOPYABLE(Download);
+public:
+#if USE(NETWORK_SESSION)
+ Download(DownloadManager&, const NetworkSession&, DownloadID, const WebCore::ResourceRequest&);
+#else
+ Download(DownloadManager&, DownloadID, const WebCore::ResourceRequest&);
+#endif
+ ~Download();
+
+ void start();
+#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
+ void dataTaskDidBecomeDownloadTask(const NetworkSession&, RetainPtr<NSURLSessionDownloadTask>&&);
+#else
+ void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
+#endif
+ void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+ void cancel();
+
+ DownloadID downloadID() const { return m_downloadID; }
+
+ void didStart();
+ void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
+ void didReceiveResponse(const WebCore::ResourceResponse&);
+ void didReceiveData(uint64_t length);
+ bool shouldDecodeSourceDataOfMIMEType(const String& mimeType);
+ String decideDestinationWithSuggestedFilename(const String& filename, bool& allowOverwrite);
+ void didCreateDestination(const String& path);
+ void didFinish();
+ void platformDidFinish();
+ void didFail(const WebCore::ResourceError&, const IPC::DataReference& resumeData);
+ void didCancel(const IPC::DataReference& resumeData);
+
+#if USE(CFNETWORK)
+ DownloadAuthenticationClient* authenticationClient();
+#endif
+
+ // Authentication
+ static void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
+ static void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
+ static void receivedCancellation(const WebCore::AuthenticationChallenge&);
+ static void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&);
+ static void receivedChallengeRejection(const WebCore::AuthenticationChallenge&);
+
+ void useCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
+ void continueWithoutCredential(const WebCore::AuthenticationChallenge&);
+ void cancelAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
+
+private:
+ // IPC::MessageSender
+ virtual IPC::Connection* messageSenderConnection() override;
+ virtual uint64_t messageSenderDestinationID() override;
+
+ void platformInvalidate();
+
+ DownloadManager& m_downloadManager;
+ DownloadID m_downloadID;
+ WebCore::ResourceRequest m_request;
+
+ RefPtr<SandboxExtension> m_sandboxExtension;
+
+#if PLATFORM(COCOA)
+#if USE(NETWORK_SESSION)
+ const NetworkSession& m_session;
+ RetainPtr<NSURLSessionDownloadTask> m_download;
+#else
+ RetainPtr<NSURLDownload> m_nsURLDownload;
+ RetainPtr<WKDownloadAsDelegate> m_delegate;
+#endif
+#endif
+#if USE(CFNETWORK)
+ RetainPtr<CFURLDownloadRef> m_download;
+ RefPtr<DownloadAuthenticationClient> m_authenticationClient;
+#endif
+#if PLATFORM(GTK) || PLATFORM(EFL)
+ std::unique_ptr<WebCore::ResourceHandleClient> m_downloadClient;
+ RefPtr<WebCore::ResourceHandle> m_resourceHandle;
+#endif
+};
+
+} // namespace WebKit
+
+#endif // Download_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadIDhfromrev194264trunkSourceWebKit2SharedDownloadsDownloadIDh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadID.h (from rev 194264, trunk/Source/WebKit2/Shared/Downloads/DownloadID.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadID.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadID.h 2015-12-18 18:08:05 UTC (rev 194272)
</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="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (194263 => 194272)</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/NetworkProcess/Downloads/DownloadManager.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,120 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-#include "config.h"
-#include "DownloadManager.h"
-
-#include "Download.h"
-#include "SessionTracker.h"
-#include <WebCore/NotImplemented.h>
-#include <WebCore/SessionID.h>
-#include <wtf/StdLibExtras.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-DownloadManager::DownloadManager(Client* client)
- : m_client(client)
-{
-}
-
-void DownloadManager::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
-{
-#if USE(NETWORK_SESSION)
- auto* networkSession = SessionTracker::networkSession(sessionID);
- if (!networkSession)
- return;
- auto download = std::make_unique<Download>(*this, *networkSession, downloadID, request);
-#else
- auto download = std::make_unique<Download>(*this, downloadID, request);
-#endif
- download->start();
-
- ASSERT(!m_downloads.contains(downloadID));
- m_downloads.add(downloadID, WTF::move(download));
-}
-
-#if !USE(NETWORK_SESSION)
-void DownloadManager::convertHandleToDownload(uint64_t downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
-{
- auto download = std::make_unique<Download>(*this, downloadID, request);
-
- download->startWithHandle(handle, response);
- ASSERT(!m_downloads.contains(downloadID));
- m_downloads.add(downloadID, WTF::move(download));
-}
-#endif
-
-void DownloadManager::resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
-{
-#if USE(NETWORK_SESSION)
- notImplemented();
-#else
- // Download::resume() is responsible for setting the Download's resource request.
- auto download = std::make_unique<Download>(*this, downloadID, ResourceRequest());
-
- download->resume(resumeData, path, sandboxExtensionHandle);
- ASSERT(!m_downloads.contains(downloadID));
- m_downloads.add(downloadID, WTF::move(download));
-#endif
-}
-
-void DownloadManager::cancelDownload(uint64_t downloadID)
-{
- Download* download = m_downloads.get(downloadID);
- if (!download)
- return;
-
- download->cancel();
-}
-
-void DownloadManager::downloadFinished(Download* download)
-{
- ASSERT(m_downloads.contains(download->downloadID()));
- m_downloads.remove(download->downloadID());
-}
-
-void DownloadManager::didCreateDownload()
-{
- m_client->didCreateDownload();
-}
-
-void DownloadManager::didDestroyDownload()
-{
- m_client->didDestroyDownload();
-}
-
-IPC::Connection* DownloadManager::downloadProxyConnection()
-{
- return m_client->downloadProxyConnection();
-}
-
-AuthenticationManager& DownloadManager::downloadsAuthenticationManager()
-{
- return m_client->downloadsAuthenticationManager();
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercppfromrev194264trunkSourceWebKit2SharedDownloadsDownloadManagercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (from rev 194264, trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,120 @@
</span><ins>+/*
+ * Copyright (C) 2010 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.
+ */
+
+#include "config.h"
+#include "DownloadManager.h"
+
+#include "Download.h"
+#include "SessionTracker.h"
+#include <WebCore/NotImplemented.h>
+#include <WebCore/SessionID.h>
+#include <wtf/StdLibExtras.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+DownloadManager::DownloadManager(Client* client)
+ : m_client(client)
+{
+}
+
+void DownloadManager::startDownload(SessionID sessionID, DownloadID downloadID, const ResourceRequest& request)
+{
+#if USE(NETWORK_SESSION)
+ auto* networkSession = SessionTracker::networkSession(sessionID);
+ if (!networkSession)
+ return;
+ auto download = std::make_unique<Download>(*this, *networkSession, downloadID, request);
+#else
+ auto download = std::make_unique<Download>(*this, downloadID, request);
+#endif
+ download->start();
+
+ ASSERT(!m_downloads.contains(downloadID));
+ m_downloads.add(downloadID, WTF::move(download));
+}
+
+#if !USE(NETWORK_SESSION)
+void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
+{
+ auto download = std::make_unique<Download>(*this, downloadID, request);
+
+ download->startWithHandle(handle, response);
+ ASSERT(!m_downloads.contains(downloadID));
+ m_downloads.add(downloadID, WTF::move(download));
+}
+#endif
+
+void DownloadManager::resumeDownload(SessionID, DownloadID downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
+{
+#if USE(NETWORK_SESSION)
+ notImplemented();
+#else
+ // Download::resume() is responsible for setting the Download's resource request.
+ auto download = std::make_unique<Download>(*this, downloadID, ResourceRequest());
+
+ download->resume(resumeData, path, sandboxExtensionHandle);
+ ASSERT(!m_downloads.contains(downloadID));
+ m_downloads.add(downloadID, WTF::move(download));
+#endif
+}
+
+void DownloadManager::cancelDownload(DownloadID downloadID)
+{
+ Download* download = m_downloads.get(downloadID);
+ if (!download)
+ return;
+
+ download->cancel();
+}
+
+void DownloadManager::downloadFinished(Download* download)
+{
+ ASSERT(m_downloads.contains(download->downloadID()));
+ m_downloads.remove(download->downloadID());
+}
+
+void DownloadManager::didCreateDownload()
+{
+ m_client->didCreateDownload();
+}
+
+void DownloadManager::didDestroyDownload()
+{
+ m_client->didDestroyDownload();
+}
+
+IPC::Connection* DownloadManager::downloadProxyConnection()
+{
+ return m_client->downloadProxyConnection();
+}
+
+AuthenticationManager& DownloadManager::downloadsAuthenticationManager()
+{
+ return m_client->downloadsAuthenticationManager();
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (194263 => 194272)</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/NetworkProcess/Downloads/DownloadManager.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 DownloadManager_h
-#define DownloadManager_h
-
-#include "SandboxExtension.h"
-#include <WebCore/NotImplemented.h>
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebCore {
-#if !USE(NETWORK_SESSION)
-class ResourceHandle;
-#endif
-class ResourceRequest;
-class ResourceResponse;
-class SessionID;
-}
-
-namespace IPC {
-class Connection;
-class DataReference;
-}
-
-namespace WebKit {
-
-class AuthenticationManager;
-class Download;
-class NetworkDataTask;
-class WebPage;
-
-class DownloadManager {
- WTF_MAKE_NONCOPYABLE(DownloadManager);
-
-public:
- class Client {
- public:
- virtual ~Client() { }
-
- virtual void didCreateDownload() = 0;
- virtual void didDestroyDownload() = 0;
- virtual IPC::Connection* downloadProxyConnection() = 0;
- virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
- };
-
- explicit DownloadManager(Client*);
-
- void startDownload(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
-#if !USE(NETWORK_SESSION)
- void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
-#endif
-
- void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
-
- void cancelDownload(uint64_t downloadID);
-
- void downloadFinished(Download*);
- bool isDownloading() const { return !m_downloads.isEmpty(); }
- uint64_t activeDownloadCount() const { return m_downloads.size(); }
-
- void didCreateDownload();
- void didDestroyDownload();
-
- IPC::Connection* downloadProxyConnection();
- AuthenticationManager& downloadsAuthenticationManager();
-
-private:
- Client* m_client;
- HashMap<uint64_t, std::unique_ptr<Download>> m_downloads;
-};
-
-} // namespace WebKit
-
-#endif // DownloadManager_h
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerhfromrev194264trunkSourceWebKit2SharedDownloadsDownloadManagerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (from rev 194264, trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,99 @@
</span><ins>+/*
+ * Copyright (C) 2010 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 DownloadManager_h
+#define DownloadManager_h
+
+#include "Download.h"
+#include "SandboxExtension.h"
+#include <WebCore/NotImplemented.h>
+#include <wtf/Forward.h>
+#include <wtf/HashMap.h>
+#include <wtf/Noncopyable.h>
+
+namespace WebCore {
+#if !USE(NETWORK_SESSION)
+class ResourceHandle;
+#endif
+class ResourceRequest;
+class ResourceResponse;
+class SessionID;
+}
+
+namespace IPC {
+class Connection;
+class DataReference;
+}
+
+namespace WebKit {
+
+class AuthenticationManager;
+class Download;
+class NetworkDataTask;
+class WebPage;
+
+class DownloadManager {
+ WTF_MAKE_NONCOPYABLE(DownloadManager);
+
+public:
+ class Client {
+ public:
+ virtual ~Client() { }
+
+ virtual void didCreateDownload() = 0;
+ virtual void didDestroyDownload() = 0;
+ virtual IPC::Connection* downloadProxyConnection() = 0;
+ virtual AuthenticationManager& downloadsAuthenticationManager() = 0;
+ };
+
+ explicit DownloadManager(Client*);
+
+ void startDownload(WebCore::SessionID, DownloadID, const WebCore::ResourceRequest&);
+#if !USE(NETWORK_SESSION)
+ void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
+#endif
+
+ void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+
+ void cancelDownload(DownloadID);
+
+ void downloadFinished(Download*);
+ bool isDownloading() const { return !m_downloads.isEmpty(); }
+ uint64_t activeDownloadCount() const { return m_downloads.size(); }
+
+ void didCreateDownload();
+ void didDestroyDownload();
+
+ IPC::Connection* downloadProxyConnection();
+ AuthenticationManager& downloadsAuthenticationManager();
+
+private:
+ Client* m_client;
+ HashMap<DownloadID, std::unique_ptr<Download>> m_downloads;
+};
+
+} // namespace WebKit
+
+#endif // DownloadManager_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParameterscppfromrev194263trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (from rev 194263, trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,168 @@
</span><ins>+/*
+ * Copyright (C) 2012 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.
+ */
+
+#include "config.h"
+#include "NetworkProcessCreationParameters.h"
+
+#include "ArgumentCoders.h"
+
+#if PLATFORM(COCOA)
+#include "ArgumentCodersCF.h"
+#endif
+
+namespace WebKit {
+
+NetworkProcessCreationParameters::NetworkProcessCreationParameters()
+{
+}
+
+void NetworkProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << privateBrowsingEnabled;
+ encoder.encodeEnum(cacheModel);
+ encoder << diskCacheSizeOverride;
+ encoder << canHandleHTTPSServerTrustEvaluation;
+ encoder << diskCacheDirectory;
+ encoder << diskCacheDirectoryExtensionHandle;
+#if ENABLE(NETWORK_CACHE)
+ encoder << shouldEnableNetworkCache;
+ encoder << shouldEnableNetworkCacheEfficacyLogging;
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+ encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
+#endif
+#endif
+#if ENABLE(SECCOMP_FILTERS)
+ encoder << cookieStorageDirectory;
+#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ encoder << uiProcessCookieStorageIdentifier;
+#endif
+#if PLATFORM(IOS)
+ encoder << cookieStorageDirectoryExtensionHandle;
+ encoder << containerCachesDirectoryExtensionHandle;
+ encoder << parentBundleDirectoryExtensionHandle;
+#endif
+ encoder << shouldUseTestingNetworkSession;
+ encoder << urlSchemesRegisteredForCustomProtocols;
+#if PLATFORM(COCOA)
+ encoder << parentProcessName;
+ encoder << uiProcessBundleIdentifier;
+ encoder << nsURLCacheMemoryCapacity;
+ encoder << nsURLCacheDiskCapacity;
+ encoder << httpProxy;
+ encoder << httpsProxy;
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+ IPC::encode(encoder, networkATSContext.get());
+#endif
+#endif
+#if USE(SOUP)
+ encoder << cookiePersistentStoragePath;
+ encoder << cookiePersistentStorageType;
+ encoder.encodeEnum(cookieAcceptPolicy);
+ encoder << ignoreTLSErrors;
+ encoder << languages;
+#endif
+}
+
+bool NetworkProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, NetworkProcessCreationParameters& result)
+{
+ if (!decoder.decode(result.privateBrowsingEnabled))
+ return false;
+ if (!decoder.decodeEnum(result.cacheModel))
+ return false;
+ if (!decoder.decode(result.diskCacheSizeOverride))
+ return false;
+ if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
+ return false;
+ if (!decoder.decode(result.diskCacheDirectory))
+ return false;
+ if (!decoder.decode(result.diskCacheDirectoryExtensionHandle))
+ return false;
+#if ENABLE(NETWORK_CACHE)
+ if (!decoder.decode(result.shouldEnableNetworkCache))
+ return false;
+ if (!decoder.decode(result.shouldEnableNetworkCacheEfficacyLogging))
+ return false;
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+ if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
+ return false;
+#endif
+#endif
+#if ENABLE(SECCOMP_FILTERS)
+ if (!decoder.decode(result.cookieStorageDirectory))
+ return false;
+#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
+ return false;
+#endif
+#if PLATFORM(IOS)
+ if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
+ return false;
+ if (!decoder.decode(result.containerCachesDirectoryExtensionHandle))
+ return false;
+ if (!decoder.decode(result.parentBundleDirectoryExtensionHandle))
+ return false;
+#endif
+ if (!decoder.decode(result.shouldUseTestingNetworkSession))
+ return false;
+ if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
+ return false;
+#if PLATFORM(COCOA)
+ if (!decoder.decode(result.parentProcessName))
+ return false;
+ if (!decoder.decode(result.uiProcessBundleIdentifier))
+ return false;
+ if (!decoder.decode(result.nsURLCacheMemoryCapacity))
+ return false;
+ if (!decoder.decode(result.nsURLCacheDiskCapacity))
+ return false;
+ if (!decoder.decode(result.httpProxy))
+ return false;
+ if (!decoder.decode(result.httpsProxy))
+ return false;
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+ if (!IPC::decode(decoder, result.networkATSContext))
+ return false;
+#endif
+#endif
+
+#if USE(SOUP)
+ if (!decoder.decode(result.cookiePersistentStoragePath))
+ return false;
+ if (!decoder.decode(result.cookiePersistentStorageType))
+ return false;
+ if (!decoder.decodeEnum(result.cookieAcceptPolicy))
+ return false;
+ if (!decoder.decode(result.ignoreTLSErrors))
+ return false;
+ if (!decoder.decode(result.languages))
+ return false;
+#endif
+
+ return true;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessCreationParametershfromrev194263trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (from rev 194263, trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessCreationParameters.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * Copyright (C) 2012 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 NetworkProcessCreationParameters_h
+#define NetworkProcessCreationParameters_h
+
+#include "CacheModel.h"
+#include "SandboxExtension.h"
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+#if USE(SOUP)
+#include "HTTPCookieAcceptPolicy.h"
+#endif
+
+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
+namespace WebKit {
+
+struct NetworkProcessCreationParameters {
+ NetworkProcessCreationParameters();
+
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NetworkProcessCreationParameters&);
+
+ bool privateBrowsingEnabled;
+ CacheModel cacheModel;
+ int64_t diskCacheSizeOverride { -1 };
+ bool canHandleHTTPSServerTrustEvaluation;
+
+ String diskCacheDirectory;
+ SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
+#if ENABLE(NETWORK_CACHE)
+ bool shouldEnableNetworkCache;
+ bool shouldEnableNetworkCacheEfficacyLogging;
+#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
+ bool shouldEnableNetworkCacheSpeculativeRevalidation;
+#endif
+#endif
+#if ENABLE(SECCOMP_FILTERS)
+ String cookieStorageDirectory;
+#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ Vector<uint8_t> uiProcessCookieStorageIdentifier;
+#endif
+#if PLATFORM(IOS)
+ SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
+ SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
+ SandboxExtension::Handle parentBundleDirectoryExtensionHandle;
+#endif
+ bool shouldUseTestingNetworkSession;
+
+ Vector<String> urlSchemesRegisteredForCustomProtocols;
+
+#if PLATFORM(COCOA)
+ String parentProcessName;
+ String uiProcessBundleIdentifier;
+ uint64_t nsURLCacheMemoryCapacity;
+ uint64_t nsURLCacheDiskCapacity;
+
+ String httpProxy;
+ String httpsProxy;
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+ RetainPtr<CFDataRef> networkATSContext;
+#endif
+#endif
+
+#if USE(SOUP)
+ String cookiePersistentStoragePath;
+ uint32_t cookiePersistentStorageType;
+ HTTPCookieAcceptPolicy cookieAcceptPolicy;
+ bool ignoreTLSErrors;
+ Vector<String> languages;
+#endif
+};
+
+} // namespace WebKit
+
+#endif // NetworkProcessCreationParameters_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessSupplementhfromrev194263trunkSourceWebKit2SharedNetworkNetworkProcessSupplementh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/NetworkProcessSupplement.h (from rev 194263, trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcessSupplement.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcessSupplement.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2012 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 NetworkProcessSupplement_h
+#define NetworkProcessSupplement_h
+
+#include "ChildProcessSupplement.h"
+
+namespace WebKit {
+
+struct NetworkProcessCreationParameters;
+
+class NetworkProcessSupplement : public ChildProcessSupplement {
+public:
+ virtual void initialize(const NetworkProcessCreationParameters&)
+ {
+ }
+};
+
+} // namespace WebKit
+
+#endif // NetworkProcessSupplement_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadParameterscppfromrev194263trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp (from rev 194263, trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.cpp 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,160 @@
</span><ins>+/*
+ * Copyright (C) 2012 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.
+ */
+
+#include "config.h"
+#include "NetworkResourceLoadParameters.h"
+
+#include "ArgumentCoders.h"
+#include "DataReference.h"
+#include "WebCoreArgumentCoders.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+NetworkResourceLoadParameters::NetworkResourceLoadParameters()
+ : identifier(0)
+ , webPageID(0)
+ , webFrameID(0)
+ , sessionID(SessionID::emptySessionID())
+ , contentSniffingPolicy(SniffContent)
+ , allowStoredCredentials(DoNotAllowStoredCredentials)
+ , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
+ , shouldClearReferrerOnHTTPSToHTTPRedirect(true)
+ , defersLoading(false)
+ , needsCertificateInfo(false)
+ , maximumBufferingTime(0_ms)
+{
+}
+
+void NetworkResourceLoadParameters::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << identifier;
+ encoder << webPageID;
+ encoder << webFrameID;
+ encoder << sessionID;
+ encoder << request;
+
+ encoder << static_cast<bool>(request.httpBody());
+ if (request.httpBody()) {
+ request.httpBody()->encode(encoder);
+
+ const Vector<FormDataElement>& elements = request.httpBody()->elements();
+ size_t fileCount = 0;
+ for (size_t i = 0, count = elements.size(); i < count; ++i) {
+ if (elements[i].m_type == FormDataElement::Type::EncodedFile)
+ ++fileCount;
+ }
+
+ SandboxExtension::HandleArray requestBodySandboxExtensions;
+ requestBodySandboxExtensions.allocate(fileCount);
+ size_t extensionIndex = 0;
+ for (size_t i = 0, count = elements.size(); i < count; ++i) {
+ const FormDataElement& element = elements[i];
+ if (element.m_type == FormDataElement::Type::EncodedFile) {
+ const String& path = element.m_shouldGenerateFile ? element.m_generatedFilename : element.m_filename;
+ SandboxExtension::createHandle(path, SandboxExtension::ReadOnly, requestBodySandboxExtensions[extensionIndex++]);
+ }
+ }
+ encoder << requestBodySandboxExtensions;
+ }
+
+ if (request.url().isLocalFile()) {
+ SandboxExtension::Handle requestSandboxExtension;
+ SandboxExtension::createHandle(request.url().fileSystemPath(), SandboxExtension::ReadOnly, requestSandboxExtension);
+ encoder << requestSandboxExtension;
+ }
+
+ encoder.encodeEnum(contentSniffingPolicy);
+ encoder.encodeEnum(allowStoredCredentials);
+ encoder.encodeEnum(clientCredentialPolicy);
+ encoder << shouldClearReferrerOnHTTPSToHTTPRedirect;
+ encoder << defersLoading;
+ encoder << needsCertificateInfo;
+ encoder << maximumBufferingTime;
+}
+
+bool NetworkResourceLoadParameters::decode(IPC::ArgumentDecoder& decoder, NetworkResourceLoadParameters& result)
+{
+ if (!decoder.decode(result.identifier))
+ return false;
+
+ if (!decoder.decode(result.webPageID))
+ return false;
+
+ if (!decoder.decode(result.webFrameID))
+ return false;
+
+ if (!decoder.decode(result.sessionID))
+ return false;
+
+ if (!decoder.decode(result.request))
+ return false;
+
+ bool hasHTTPBody;
+ if (!decoder.decode(hasHTTPBody))
+ return false;
+
+ if (hasHTTPBody) {
+ RefPtr<FormData> formData = FormData::decode(decoder);
+ if (!formData)
+ return false;
+ result.request.setHTTPBody(formData.release());
+
+ SandboxExtension::HandleArray requestBodySandboxExtensionHandles;
+ if (!decoder.decode(requestBodySandboxExtensionHandles))
+ return false;
+ for (size_t i = 0; i < requestBodySandboxExtensionHandles.size(); ++i) {
+ if (RefPtr<SandboxExtension> extension = SandboxExtension::create(requestBodySandboxExtensionHandles[i]))
+ result.requestBodySandboxExtensions.append(extension.release());
+ }
+ }
+
+ if (result.request.url().isLocalFile()) {
+ SandboxExtension::Handle resourceSandboxExtensionHandle;
+ if (!decoder.decode(resourceSandboxExtensionHandle))
+ return false;
+ result.resourceSandboxExtension = SandboxExtension::create(resourceSandboxExtensionHandle);
+ }
+
+ if (!decoder.decodeEnum(result.contentSniffingPolicy))
+ return false;
+ if (!decoder.decodeEnum(result.allowStoredCredentials))
+ return false;
+ if (!decoder.decodeEnum(result.clientCredentialPolicy))
+ return false;
+ if (!decoder.decode(result.shouldClearReferrerOnHTTPSToHTTPRedirect))
+ return false;
+ if (!decoder.decode(result.defersLoading))
+ return false;
+ if (!decoder.decode(result.needsCertificateInfo))
+ return false;
+ if (!decoder.decode(result.maximumBufferingTime))
+ return false;
+
+ return true;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadParametershfromrev194263trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h (from rev 194263, trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h) (0 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadParameters.h 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2012, 2013 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 NetworkResourceLoadParameters_h
+#define NetworkResourceLoadParameters_h
+
+#include "SandboxExtension.h"
+#include <WebCore/ResourceHandle.h>
+#include <WebCore/ResourceLoaderOptions.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/SessionID.h>
+
+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
+namespace WebKit {
+
+typedef uint64_t ResourceLoadIdentifier;
+
+class NetworkResourceLoadParameters {
+public:
+ NetworkResourceLoadParameters();
+
+ void encode(IPC::ArgumentEncoder&) const;
+ static bool decode(IPC::ArgumentDecoder&, NetworkResourceLoadParameters&);
+
+ ResourceLoadIdentifier identifier;
+ uint64_t webPageID;
+ uint64_t webFrameID;
+ WebCore::SessionID sessionID;
+ WebCore::ResourceRequest request;
+ Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
+ RefPtr<SandboxExtension> resourceSandboxExtension; // Created automatically for the sender.
+ WebCore::ContentSniffingPolicy contentSniffingPolicy;
+ WebCore::StoredCredentials allowStoredCredentials;
+ WebCore::ClientCredentialPolicy clientCredentialPolicy;
+ bool shouldClearReferrerOnHTTPSToHTTPRedirect;
+ bool defersLoading;
+ bool needsCertificateInfo;
+ std::chrono::milliseconds maximumBufferingTime;
+};
+
+} // namespace WebKit
+
+#endif // NetworkResourceLoadParameters_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -1,6 +1,13 @@
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><span class="cx"> DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
</span><span class="cx">
</span><ins>+ NetworkProcess/CustomProtocols/soup/CustomProtocolManagerImpl.cpp
+ NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
+
+ NetworkProcess/Downloads/efl/DownloadSoupErrorsEfl.cpp
+
+ NetworkProcess/Downloads/soup/DownloadSoup.cpp
+
</ins><span class="cx"> NetworkProcess/efl/NetworkProcessMainEfl.cpp
</span><span class="cx">
</span><span class="cx"> NetworkProcess/soup/NetworkProcessSoup.cpp
</span><span class="lines">@@ -27,13 +34,6 @@
</span><span class="cx"> Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
</span><span class="cx"> Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
</span><span class="cx">
</span><del>- Shared/Downloads/efl/DownloadSoupErrorsEfl.cpp
-
- Shared/Downloads/soup/DownloadSoup.cpp
-
- Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp
- Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
-
</del><span class="cx"> Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
</span><span class="cx">
</span><span class="cx"> Shared/Plugins/unix/PluginSearchPath.cpp
</span><span class="lines">@@ -246,13 +246,13 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/enchant"
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/unix"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
+ "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
</ins><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/c/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
</span><del>- "${WEBKIT2_DIR}/Shared/Downloads/soup"
- "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
</del><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/glib"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/efl"
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -27,6 +27,13 @@
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><span class="cx"> DatabaseProcess/gtk/DatabaseProcessMainGtk.cpp
</span><span class="cx">
</span><ins>+ NetworkProcess/CustomProtocols/soup/CustomProtocolManagerImpl.cpp
+ NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
+
+ NetworkProcess/Downloads/gtk/DownloadSoupErrorsGtk.cpp
+
+ NetworkProcess/Downloads/soup/DownloadSoup.cpp
+
</ins><span class="cx"> NetworkProcess/cache/NetworkCacheDataSoup.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
</span><span class="cx">
</span><span class="lines">@@ -50,13 +57,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/API/c/cairo/WKImageCairo.cpp
</span><span class="cx">
</span><del>- Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp
-
- Shared/Downloads/soup/DownloadSoup.cpp
-
- Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp
- Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
-
</del><span class="cx"> Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
</span><span class="cx">
</span><span class="cx"> Shared/Plugins/unix/PluginSearchPath.cpp
</span><span class="lines">@@ -496,12 +496,12 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/enchant"
</span><span class="cx"> "${WEBKIT2_DIR}/DatabaseProcess/unix"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/CustomProtocols/soup"
+ "${WEBKIT2_DIR}/NetworkProcess/Downloads/soup"
</ins><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/gtk"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/IPC/glib"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/c/gtk"
</span><del>- "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
- "${WEBKIT2_DIR}/Shared/Downloads/soup"
</del><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/unix"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/glib"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/gtk"
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -12,6 +12,10 @@
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><span class="cx"> DatabaseProcess/mac/DatabaseProcessMac.mm
</span><span class="cx">
</span><ins>+ NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
+
+ NetworkProcess/Downloads/mac/DownloadMac.mm
+
</ins><span class="cx"> NetworkProcess/cache/NetworkCacheDataCocoa.mm
</span><span class="cx"> NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
</span><span class="cx">
</span><span class="lines">@@ -89,10 +93,6 @@
</span><span class="cx"> Shared/Cocoa/WKNSURLRequest.mm
</span><span class="cx"> Shared/Cocoa/WKObject.mm
</span><span class="cx">
</span><del>- Shared/Downloads/mac/DownloadMac.mm
-
- Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
-
</del><span class="cx"> Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
</span><span class="cx"> Shared/Plugins/Netscape/mac/PluginInformationMac.mm
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194271 => 194272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 16:34:03 UTC (rev 194271)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 18:08:05 UTC (rev 194272)
</span><span class="lines">@@ -585,8 +585,6 @@
</span><span class="cx"> 2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F57B164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h */; };
</span><span class="cx"> 2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */; };
</span><span class="cx"> 2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */; };
</span><del>- 2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */; };
- 2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2989A412167D184B004F96D2 /* CustomProtocolManager.h */; };
</del><span class="cx"> 29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */; };
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */; };
</span><span class="cx"> 29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h */; };
</span><span class="lines">@@ -672,7 +670,6 @@
</span><span class="cx"> 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */; };
</span><span class="cx"> 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */; };
</span><span class="cx"> 2DA944A41884E4F000ED86DB /* GestureTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DA9449D1884E4F000ED86DB /* GestureTypes.h */; };
</span><del>- 2DA944A71884E94800ED86DB /* DownloadIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944A61884E94800ED86DB /* DownloadIOS.mm */; };
</del><span class="cx"> 2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */; };
</span><span class="cx"> 2DA944AF1884E9BA00ED86DB /* WebPageProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */; };
</span><span class="cx"> 2DA944B01884E9BA00ED86DB /* WebProcessProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */; };
</span><span class="lines">@@ -963,8 +960,6 @@
</span><span class="cx"> 5179556A162876F300FA43B6 /* NetworkProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7E016138E2900D03ED3 /* NetworkProcess.h */; };
</span><span class="cx"> 5179556D162877B100FA43B6 /* NetworkProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7EA16138E7200D03ED3 /* NetworkProcessProxy.cpp */; };
</span><span class="cx"> 5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 510CC7EB16138E7200D03ED3 /* NetworkProcessProxy.h */; };
</span><del>- 51795570162877CF00FA43B6 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6121627F325000D90E9 /* NetworkProcessCreationParameters.cpp */; };
- 51795571162877D200FA43B6 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8A60F1627F2BD000D90E9 /* NetworkProcessCreationParameters.h */; };
</del><span class="cx"> 517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */; };
</span><span class="cx"> 517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */; };
</span><span class="lines">@@ -986,13 +981,6 @@
</span><span class="cx"> 518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8EF316B2091C00E91429 /* AuthenticationManager.cpp */; };
</span><span class="cx"> 518E8EF916B2091C00E91429 /* AuthenticationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8EF416B2091C00E91429 /* AuthenticationManager.h */; };
</span><span class="cx"> 518E8EFB16B2091C00E91429 /* AuthenticationManager.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518E8EF716B2091C00E91429 /* AuthenticationManager.mac.mm */; };
</span><del>- 518E8F0716B2093700E91429 /* Download.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8EFE16B2093700E91429 /* Download.cpp */; };
- 518E8F0816B2093700E91429 /* Download.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8EFF16B2093700E91429 /* Download.h */; };
- 518E8F0916B2093700E91429 /* DownloadAuthenticationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8F0016B2093700E91429 /* DownloadAuthenticationClient.cpp */; };
- 518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8F0116B2093700E91429 /* DownloadAuthenticationClient.h */; };
- 518E8F0B16B2093700E91429 /* DownloadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518E8F0216B2093700E91429 /* DownloadManager.cpp */; };
- 518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 518E8F0316B2093700E91429 /* DownloadManager.h */; };
- 518E8F0D16B2093700E91429 /* DownloadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518E8F0516B2093700E91429 /* DownloadMac.mm */; };
</del><span class="cx"> 51933DEF1965EB31008AC3EA /* MenuUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 51933DEB1965EB24008AC3EA /* MenuUtilities.h */; };
</span><span class="cx"> 51933DF01965EB31008AC3EA /* MenuUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51933DEC1965EB24008AC3EA /* MenuUtilities.mm */; };
</span><span class="cx"> 51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */; };
</span><span class="lines">@@ -1014,8 +1002,6 @@
</span><span class="cx"> 51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */; };
</span><span class="cx"> 51C96118183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51C96116183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 51C96119183D294700D2002E /* WebIDBServerConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */; };
</span><del>- 51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */; };
- 51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */; };
</del><span class="cx"> 51CD1C5D1B3493AF00142CA5 /* WKSecurityOriginRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */; };
</span><span class="cx"> 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CD1C5F1B34B9C900142CA5 /* WKSecurityOrigin.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="lines">@@ -1064,10 +1050,25 @@
</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><del>- 5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C0932061C236011007AAA7C /* DownloadID.h */; };
</del><ins>+ 5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */; };
+ 5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */; };
+ 5C1426EE1C23F80900D41183 /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E41C23F80500D41183 /* NetworkProcessSupplement.h */; };
+ 5C1426EF1C23F80900D41183 /* NetworkResourceLoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E51C23F80500D41183 /* NetworkResourceLoadParameters.cpp */; };
+ 5C1426F01C23F80900D41183 /* NetworkResourceLoadParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */; };
+ 5C1427011C23F84C00D41183 /* Download.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F31C23F84300D41183 /* Download.cpp */; };
+ 5C1427021C23F84C00D41183 /* Download.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F41C23F84300D41183 /* Download.h */; };
+ 5C1427031C23F84C00D41183 /* DownloadAuthenticationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */; };
+ 5C1427041C23F84C00D41183 /* DownloadAuthenticationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */; };
+ 5C1427051C23F84C00D41183 /* DownloadID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F71C23F84300D41183 /* DownloadID.h */; };
+ 5C1427061C23F84C00D41183 /* DownloadManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426F81C23F84300D41183 /* DownloadManager.cpp */; };
+ 5C1427071C23F84C00D41183 /* DownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426F91C23F84300D41183 /* DownloadManager.h */; };
+ 5C1427111C23F89E00D41183 /* DownloadIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C14270D1C23F88500D41183 /* DownloadIOS.mm */; };
+ 5C1427121C23F89E00D41183 /* DownloadMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C14270F1C23F89900D41183 /* DownloadMac.mm */; };
+ 5C1427131C23F89E00D41183 /* DownloadCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C1427091C23F86900D41183 /* DownloadCocoa.mm */; };
+ 5C1427181C23F8B700D41183 /* CustomProtocolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1427141C23F8B000D41183 /* CustomProtocolManager.h */; };
+ 5C14271D1C23F8CF00D41183 /* CustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C14271B1C23F8CC00D41183 /* CustomProtocolManagerCocoa.mm */; };
</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><del>- 5C9B86131C223EAF00110F36 /* DownloadCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */; };
</del><span class="cx"> 5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
</span><span class="cx"> 5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
</span><span class="cx"> 6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
</span><span class="lines">@@ -1651,7 +1652,6 @@
</span><span class="cx"> BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF049E411FE20F600F86A58 /* WKBundleFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCF049E711FE20F600F86A58 /* WKBundlePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF049E511FE20F600F86A58 /* WKBundlePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCF18638167D071E00A1A85A /* CacheModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF18637167D071E00A1A85A /* CacheModel.cpp */; };
</span><del>- BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */; };
</del><span class="cx"> BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */; };
</span><span class="cx"> BCF50728124329AA005955AE /* WebCertificateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF50726124329AA005955AE /* WebCertificateInfo.h */; };
</span><span class="cx"> BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69F981176CED600471A52 /* WebNavigationDataStore.h */; };
</span><span class="lines">@@ -2730,9 +2730,6 @@
</span><span class="cx"> 2984F57B164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomProtocolManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerMessages.h; sourceTree = "<group>"; };
</span><del>- 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
- 2989A412167D184B004F96D2 /* CustomProtocolManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManager.h; path = Network/CustomProtocols/CustomProtocolManager.h; sourceTree = "<group>"; };
- 2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManager.messages.in; path = Network/CustomProtocols/CustomProtocolManager.messages.in; sourceTree = "<group>"; };
</del><span class="cx"> 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManagerProxy.h; path = CustomProtocols/CustomProtocolManagerProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerProxyMac.mm; path = CustomProtocols/mac/CustomProtocolManagerProxyMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 29AD3097164B4E210072DEA9 /* CustomProtocolManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManagerProxy.messages.in; path = CustomProtocols/CustomProtocolManagerProxy.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -2834,7 +2831,6 @@
</span><span class="cx"> 2DA9449B1884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPlatformTouchPointIOS.cpp; path = ios/WebPlatformTouchPointIOS.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2DA9449C1884E4F000ED86DB /* WebTouchEventIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebTouchEventIOS.cpp; path = ios/WebTouchEventIOS.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2DA9449D1884E4F000ED86DB /* GestureTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GestureTypes.h; path = ios/GestureTypes.h; sourceTree = "<group>"; };
</span><del>- 2DA944A61884E94800ED86DB /* DownloadIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadIOS.mm; path = Downloads/ios/DownloadIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> 2DA944A91884E9BA00ED86DB /* TextCheckerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TextCheckerIOS.mm; path = ios/TextCheckerIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944AB1884E9BA00ED86DB /* WebPageProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebPageProxyIOS.mm; path = ios/WebPageProxyIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DA944AC1884E9BA00ED86DB /* WebProcessProxyIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebProcessProxyIOS.mm; path = ios/WebProcessProxyIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3163,13 +3159,6 @@
</span><span class="cx"> 518E8EF416B2091C00E91429 /* AuthenticationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthenticationManager.h; path = Authentication/AuthenticationManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 518E8EF516B2091C00E91429 /* AuthenticationManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AuthenticationManager.messages.in; path = Authentication/AuthenticationManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 518E8EF716B2091C00E91429 /* AuthenticationManager.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AuthenticationManager.mac.mm; sourceTree = "<group>"; };
</span><del>- 518E8EFE16B2093700E91429 /* Download.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Download.cpp; path = Downloads/Download.cpp; sourceTree = "<group>"; };
- 518E8EFF16B2093700E91429 /* Download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Download.h; path = Downloads/Download.h; sourceTree = "<group>"; };
- 518E8F0016B2093700E91429 /* DownloadAuthenticationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadAuthenticationClient.cpp; path = Downloads/DownloadAuthenticationClient.cpp; sourceTree = "<group>"; };
- 518E8F0116B2093700E91429 /* DownloadAuthenticationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadAuthenticationClient.h; path = Downloads/DownloadAuthenticationClient.h; sourceTree = "<group>"; };
- 518E8F0216B2093700E91429 /* DownloadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadManager.cpp; path = Downloads/DownloadManager.cpp; sourceTree = "<group>"; };
- 518E8F0316B2093700E91429 /* DownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadManager.h; path = Downloads/DownloadManager.h; sourceTree = "<group>"; };
- 518E8F0516B2093700E91429 /* DownloadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DownloadMac.mm; sourceTree = "<group>"; };
</del><span class="cx"> 51933DEB1965EB24008AC3EA /* MenuUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> 51933DEC1965EB24008AC3EA /* MenuUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MenuUtilities.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsRequest.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3183,8 +3172,6 @@
</span><span class="cx"> 51A7F2F2125BF820008AEB1D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = "<group>"; };
</span><span class="cx"> 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Logging.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebContextMenuProxy.cpp; sourceTree = "<group>"; };
</span><del>- 51A8A60F1627F2BD000D90E9 /* NetworkProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessCreationParameters.h; path = Network/NetworkProcessCreationParameters.h; sourceTree = "<group>"; };
- 51A8A6121627F325000D90E9 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = Network/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProcessMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkProcess.messages.in; path = NetworkProcess/NetworkProcess.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKKeyValueStorageManager.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3202,8 +3189,6 @@
</span><span class="cx"> 51C96115183C95FF00D2002E /* WebIDBServerConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebIDBServerConnection.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 51C96116183D294700D2002E /* WebIDBServerConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIDBServerConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51C96117183D294700D2002E /* WebIDBServerConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIDBServerConnectionMessages.h; sourceTree = "<group>"; };
</span><del>- 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkResourceLoadParameters.cpp; path = Network/NetworkResourceLoadParameters.cpp; sourceTree = "<group>"; };
- 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadParameters.h; path = Network/NetworkResourceLoadParameters.h; sourceTree = "<group>"; };
</del><span class="cx"> 51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSecurityOriginRef.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOriginRef.h; sourceTree = "<group>"; };
</span><span class="cx"> 51CD1C5F1B34B9C900142CA5 /* WKSecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSecurityOrigin.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3257,10 +3242,26 @@
</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><del>- 5C0932061C236011007AAA7C /* DownloadID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadID.h; path = Downloads/DownloadID.h; sourceTree = "<group>"; };
</del><ins>+ 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = NetworkProcess/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
+ 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessCreationParameters.h; path = NetworkProcess/NetworkProcessCreationParameters.h; sourceTree = "<group>"; };
+ 5C1426E41C23F80500D41183 /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = NetworkProcess/NetworkProcessSupplement.h; sourceTree = "<group>"; };
+ 5C1426E51C23F80500D41183 /* NetworkResourceLoadParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkResourceLoadParameters.cpp; path = NetworkProcess/NetworkResourceLoadParameters.cpp; sourceTree = "<group>"; };
+ 5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkResourceLoadParameters.h; path = NetworkProcess/NetworkResourceLoadParameters.h; sourceTree = "<group>"; };
+ 5C1426F31C23F84300D41183 /* Download.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Download.cpp; path = NetworkProcess/Downloads/Download.cpp; sourceTree = "<group>"; };
+ 5C1426F41C23F84300D41183 /* Download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Download.h; path = NetworkProcess/Downloads/Download.h; sourceTree = "<group>"; };
+ 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadAuthenticationClient.cpp; path = NetworkProcess/Downloads/DownloadAuthenticationClient.cpp; sourceTree = "<group>"; };
+ 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadAuthenticationClient.h; path = NetworkProcess/Downloads/DownloadAuthenticationClient.h; sourceTree = "<group>"; };
+ 5C1426F71C23F84300D41183 /* DownloadID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadID.h; path = NetworkProcess/Downloads/DownloadID.h; sourceTree = "<group>"; };
+ 5C1426F81C23F84300D41183 /* DownloadManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadManager.cpp; path = NetworkProcess/Downloads/DownloadManager.cpp; sourceTree = "<group>"; };
+ 5C1426F91C23F84300D41183 /* DownloadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadManager.h; path = NetworkProcess/Downloads/DownloadManager.h; sourceTree = "<group>"; };
+ 5C1427091C23F86900D41183 /* DownloadCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadCocoa.mm; path = NetworkProcess/Downloads/cocoa/DownloadCocoa.mm; sourceTree = "<group>"; };
+ 5C14270D1C23F88500D41183 /* DownloadIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadIOS.mm; path = NetworkProcess/Downloads/ios/DownloadIOS.mm; sourceTree = "<group>"; };
+ 5C14270F1C23F89900D41183 /* DownloadMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadMac.mm; path = NetworkProcess/Downloads/mac/DownloadMac.mm; sourceTree = "<group>"; };
+ 5C1427141C23F8B000D41183 /* CustomProtocolManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManager.h; path = NetworkProcess/CustomProtocols/CustomProtocolManager.h; sourceTree = "<group>"; };
+ 5C1427151C23F8B000D41183 /* CustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManager.messages.in; path = NetworkProcess/CustomProtocols/CustomProtocolManager.messages.in; sourceTree = "<group>"; };
+ 5C14271B1C23F8CC00D41183 /* CustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerCocoa.mm; path = NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm; 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><del>- 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadCocoa.mm; path = Downloads/cocoa/DownloadCocoa.mm; sourceTree = "<group>"; };
</del><span class="cx"> 5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
</span><span class="cx"> 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerEnvironmentExtractor.h; sourceTree = "<group>"; };
</span><span class="cx"> 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynamicLinkerEnvironmentExtractor.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3893,7 +3894,6 @@
</span><span class="cx"> BCF04C8C11FF9B7D00F86A58 /* APIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIObject.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF04C8E11FF9F6E00F86A58 /* APIString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIString.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF18637167D071E00A1A85A /* CacheModel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheModel.cpp; sourceTree = "<group>"; };
</span><del>- BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessSupplement.h; path = Network/NetworkProcessSupplement.h; sourceTree = "<group>"; };
</del><span class="cx"> BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> BCF5068412431861005955AE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> BCF50726124329AA005955AE /* WebCertificateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCertificateInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4709,12 +4709,10 @@
</span><span class="cx"> C01A25FF12662F2100C9ED55 /* cg */,
</span><span class="cx"> 37C4C0901814B37B003688B9 /* Cocoa */,
</span><span class="cx"> 51E351C2180F2C8500E53BE9 /* Databases */,
</span><del>- 518E8EF216B208F800E91429 /* Downloads */,
</del><span class="cx"> BC82836816B3587900A278FE /* EntryPointUtilities */,
</span><span class="cx"> E170877216D6CFEC00F99226 /* FileAPI */,
</span><span class="cx"> 2DA944961884E4DA00ED86DB /* ios */,
</span><span class="cx"> BC111B5A112F628200337BAB /* mac */,
</span><del>- 51A8A60D1627F2AC000D90E9 /* Network */,
</del><span class="cx"> 1AAE058C1279DCD400852418 /* Plugins */,
</span><span class="cx"> 3709504918A9FAD20087AE5D /* posix */,
</span><span class="cx"> 0F5947A0187B3B7100437857 /* Scrolling */,
</span><span class="lines">@@ -5071,25 +5069,6 @@
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 2989A40E167D1813004F96D2 /* CustomProtocols */ = {
- isa = PBXGroup;
- children = (
- 2989A40F167D181B004F96D2 /* Cocoa */,
- 2989A412167D184B004F96D2 /* CustomProtocolManager.h */,
- 2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */,
- );
- name = CustomProtocols;
- sourceTree = "<group>";
- };
- 2989A40F167D181B004F96D2 /* Cocoa */ = {
- isa = PBXGroup;
- children = (
- 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */,
- );
- name = Cocoa;
- path = Network/CustomProtocols/Cocoa;
- sourceTree = "<group>";
- };
</del><span class="cx"> 29AD3091164B4C100072DEA9 /* CustomProtocols */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5147,14 +5126,6 @@
</span><span class="cx"> name = ios;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 2DA944A51884E93C00ED86DB /* ios */ = {
- isa = PBXGroup;
- children = (
- 2DA944A61884E94800ED86DB /* DownloadIOS.mm */,
- );
- name = ios;
- sourceTree = "<group>";
- };
</del><span class="cx"> 2DA944A81884E9AB00ED86DB /* ios */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5570,6 +5541,13 @@
</span><span class="cx"> 510CC7DA16138E0100D03ED3 /* NetworkProcess */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5C1426F21C23F82D00D41183 /* CustomProtocols */,
+ 5C1426F11C23F81700D41183 /* Downloads */,
+ 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */,
+ 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */,
+ 5C1426E41C23F80500D41183 /* NetworkProcessSupplement.h */,
+ 5C1426E51C23F80500D41183 /* NetworkResourceLoadParameters.cpp */,
+ 5C1426E61C23F80500D41183 /* NetworkResourceLoadParameters.h */,
</ins><span class="cx"> E489D2821A0A2BE80078C06A /* cache */,
</span><span class="cx"> 7EC4F0F818E4A922008056AF /* cocoa */,
</span><span class="cx"> BC82837C16B45DA500A278FE /* EntryPoint */,
</span><span class="lines">@@ -5744,23 +5722,6 @@
</span><span class="cx"> name = Authentication;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 518E8EF216B208F800E91429 /* Downloads */ = {
- isa = PBXGroup;
- children = (
- 5C0932061C236011007AAA7C /* DownloadID.h */,
- 5C9B860E1C223E5400110F36 /* cocoa */,
- 2DA944A51884E93C00ED86DB /* ios */,
- 518E8F0416B2093700E91429 /* mac */,
- 518E8EFE16B2093700E91429 /* Download.cpp */,
- 518E8EFF16B2093700E91429 /* Download.h */,
- 518E8F0016B2093700E91429 /* DownloadAuthenticationClient.cpp */,
- 518E8F0116B2093700E91429 /* DownloadAuthenticationClient.h */,
- 518E8F0216B2093700E91429 /* DownloadManager.cpp */,
- 518E8F0316B2093700E91429 /* DownloadManager.h */,
- );
- name = Downloads;
- sourceTree = "<group>";
- };
</del><span class="cx"> 518E8EF616B2091C00E91429 /* mac */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5770,28 +5731,6 @@
</span><span class="cx"> path = Authentication/mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 518E8F0416B2093700E91429 /* mac */ = {
- isa = PBXGroup;
- children = (
- 518E8F0516B2093700E91429 /* DownloadMac.mm */,
- );
- name = mac;
- path = Downloads/mac;
- sourceTree = "<group>";
- };
- 51A8A60D1627F2AC000D90E9 /* Network */ = {
- isa = PBXGroup;
- children = (
- 2989A40E167D1813004F96D2 /* CustomProtocols */,
- 51A8A6121627F325000D90E9 /* NetworkProcessCreationParameters.cpp */,
- 51A8A60F1627F2BD000D90E9 /* NetworkProcessCreationParameters.h */,
- BCF4DE22168E4BD500C94AFC /* NetworkProcessSupplement.h */,
- 51CBBA0D165219B6005BE8FD /* NetworkResourceLoadParameters.cpp */,
- 51CBBA0E165219B6005BE8FD /* NetworkResourceLoadParameters.h */,
- );
- name = Network;
- sourceTree = "<group>";
- };
</del><span class="cx"> 51B15A7D138439B200321AD8 /* unix */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -5902,14 +5841,65 @@
</span><span class="cx"> name = IconDatabase;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><del>- 5C9B860E1C223E5400110F36 /* cocoa */ = {
</del><ins>+ 5C1426F11C23F81700D41183 /* Downloads */ = {
</ins><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */,
</del><ins>+ 5C14270C1C23F87700D41183 /* ios */,
+ 5C14270B1C23F87100D41183 /* mac */,
+ 5C1427081C23F85200D41183 /* cocoa */,
+ 5C1426F31C23F84300D41183 /* Download.cpp */,
+ 5C1426F41C23F84300D41183 /* Download.h */,
+ 5C1426F51C23F84300D41183 /* DownloadAuthenticationClient.cpp */,
+ 5C1426F61C23F84300D41183 /* DownloadAuthenticationClient.h */,
+ 5C1426F71C23F84300D41183 /* DownloadID.h */,
+ 5C1426F81C23F84300D41183 /* DownloadManager.cpp */,
+ 5C1426F91C23F84300D41183 /* DownloadManager.h */,
</ins><span class="cx"> );
</span><ins>+ name = Downloads;
+ sourceTree = "<group>";
+ };
+ 5C1426F21C23F82D00D41183 /* CustomProtocols */ = {
+ isa = PBXGroup;
+ children = (
+ 5C14271A1C23F8BF00D41183 /* Cocoa */,
+ 5C1427141C23F8B000D41183 /* CustomProtocolManager.h */,
+ 5C1427151C23F8B000D41183 /* CustomProtocolManager.messages.in */,
+ );
+ name = CustomProtocols;
+ sourceTree = "<group>";
+ };
+ 5C1427081C23F85200D41183 /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 5C1427091C23F86900D41183 /* DownloadCocoa.mm */,
+ );
</ins><span class="cx"> name = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 5C14270B1C23F87100D41183 /* mac */ = {
+ isa = PBXGroup;
+ children = (
+ 5C14270F1C23F89900D41183 /* DownloadMac.mm */,
+ );
+ name = mac;
+ sourceTree = "<group>";
+ };
+ 5C14270C1C23F87700D41183 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ 5C14270D1C23F88500D41183 /* DownloadIOS.mm */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
+ 5C14271A1C23F8BF00D41183 /* Cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 5C14271B1C23F8CC00D41183 /* CustomProtocolManagerCocoa.mm */,
+ );
+ name = Cocoa;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 6EE849C41368D9040038D481 /* mac */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -7693,6 +7683,7 @@
</span><span class="cx"> 7C89D2B41A6B068C003A5FDE /* APIUserContentExtension.h in Headers */,
</span><span class="cx"> 7C3A06A81AAB903E009D74BA /* APIUserContentExtensionStore.h in Headers */,
</span><span class="cx"> F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */,
</span><ins>+ 5C1426F01C23F80900D41183 /* NetworkResourceLoadParameters.h in Headers */,
</ins><span class="cx"> 7C89D2941A67122F003A5FDE /* APIUserScript.h in Headers */,
</span><span class="cx"> 2D8786241BDB58FF00D02ABB /* APIUserStyleSheet.h in Headers */,
</span><span class="cx"> C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */,
</span><span class="lines">@@ -7738,7 +7729,6 @@
</span><span class="cx"> CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */,
</span><span class="cx"> CE1A0BD31A48E6C60054EF74 /* CorePDFSPI.h in Headers */,
</span><span class="cx"> B878B615133428DC006888E9 /* CorrectionPanel.h in Headers */,
</span><del>- 2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */,
</del><span class="cx"> 2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
</span><span class="cx"> 29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */,
</span><span class="cx"> 2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */,
</span><span class="lines">@@ -7751,10 +7741,7 @@
</span><span class="cx"> CE1A0BD41A48E6C60054EF74 /* DataDetectorsUISPI.h in Headers */,
</span><span class="cx"> 1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
</span><span class="cx"> 83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */,
</span><del>- 518E8F0816B2093700E91429 /* Download.h in Headers */,
- 518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */,
</del><span class="cx"> A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
</span><del>- 518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */,
</del><span class="cx"> 1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */,
</span><span class="cx"> 1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */,
</span><span class="cx"> 1AB7D61A1288B9D900CFD08C /* DownloadProxyMessages.h in Headers */,
</span><span class="lines">@@ -7864,15 +7851,12 @@
</span><span class="cx"> 839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */,
</span><span class="cx"> 5179556A162876F300FA43B6 /* NetworkProcess.h in Headers */,
</span><span class="cx"> 517CF0E4163A486C00C2950E /* NetworkProcessConnectionMessages.h in Headers */,
</span><del>- 51795571162877D200FA43B6 /* NetworkProcessCreationParameters.h in Headers */,
</del><span class="cx"> 5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */,
</span><span class="cx"> E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */,
</span><span class="cx"> 5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */,
</span><span class="cx"> 513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
</span><del>- BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
</del><span class="cx"> 51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
</span><span class="cx"> E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
</span><del>- 51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
</del><span class="cx"> 5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */,
</span><span class="cx"> 31A2EC5614899C0900810D71 /* NotificationPermissionRequest.h in Headers */,
</span><span class="cx"> 3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */,
</span><span class="lines">@@ -7889,6 +7873,7 @@
</span><span class="cx"> 3754D5451B3A29FD003A4C7F /* NSInvocationSPI.h in Headers */,
</span><span class="cx"> BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */,
</span><span class="cx"> BCCF672D12C7EDF7008F9C35 /* OriginAndDatabases.h in Headers */,
</span><ins>+ 5C1427181C23F8B700D41183 /* CustomProtocolManager.h in Headers */,
</ins><span class="cx"> 7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */,
</span><span class="cx"> BC6EDAA6111271C600E7678B /* PageClient.h in Headers */,
</span><span class="cx"> 0FCB4E6218BBE3D9000FCFC9 /* PageClientImpl.h in Headers */,
</span><span class="lines">@@ -8132,6 +8117,7 @@
</span><span class="cx"> BC032D8F10F437A00058C15A /* WebPage.h in Headers */,
</span><span class="cx"> 8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */,
</span><span class="cx"> BC7B6206129A0A6700D174A4 /* WebPageGroup.h in Headers */,
</span><ins>+ 5C1427071C23F84C00D41183 /* DownloadManager.h in Headers */,
</ins><span class="cx"> BC7B625212A43C9600D174A4 /* WebPageGroupData.h in Headers */,
</span><span class="cx"> BC7B621512A4219A00D174A4 /* WebPageGroupProxy.h in Headers */,
</span><span class="cx"> 29D55DF2161BF9F10031A2E3 /* WebPageGroupProxyMessages.h in Headers */,
</span><span class="lines">@@ -8255,6 +8241,7 @@
</span><span class="cx"> 1AB474DA184D44250051B622 /* WKBundlePageResourceLoadClient.h in Headers */,
</span><span class="cx"> 1AB474DE184D44590051B622 /* WKBundlePageUIClient.h in Headers */,
</span><span class="cx"> BCF049E711FE20F600F86A58 /* WKBundlePrivate.h in Headers */,
</span><ins>+ 5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */,
</ins><span class="cx"> BC60C5791240A546008C5E29 /* WKBundleRangeHandle.h in Headers */,
</span><span class="cx"> BC5D24C716CD73C5007D5461 /* WKBundleRangeHandlePrivate.h in Headers */,
</span><span class="cx"> BC14DF9F120B635F00826C0C /* WKBundleScriptWorld.h in Headers */,
</span><span class="lines">@@ -8305,6 +8292,7 @@
</span><span class="cx"> C54256B718BEC18C00DE4179 /* WKFormPeripheral.h in Headers */,
</span><span class="cx"> C54256B818BEC18C00DE4179 /* WKFormPopover.h in Headers */,
</span><span class="cx"> C54256BA18BEC18C00DE4179 /* WKFormSelectControl.h in Headers */,
</span><ins>+ 5C1426EE1C23F80900D41183 /* NetworkProcessSupplement.h in Headers */,
</ins><span class="cx"> BCE4695A1214EDF4000B98EB /* WKFormSubmissionListener.h in Headers */,
</span><span class="cx"> 37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */,
</span><span class="cx"> BCD0139B110FA420003B8A67 /* WKFrame.h in Headers */,
</span><span class="lines">@@ -8315,7 +8303,6 @@
</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><del>- 5C1426E11C23F50B00D41183 /* DownloadID.h in Headers */,
</del><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 class="lines">@@ -8384,6 +8371,7 @@
</span><span class="cx"> 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */,
</span><span class="cx"> 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */,
</span><span class="cx"> 1AB8A1F618400B9D00E9AE69 /* WKPageFindMatchesClient.h in Headers */,
</span><ins>+ 5C1427051C23F84C00D41183 /* DownloadID.h in Headers */,
</ins><span class="cx"> 1AB8A1F018400B0000E9AE69 /* WKPageFormClient.h in Headers */,
</span><span class="cx"> BC7B633712A45ABA00D174A4 /* WKPageGroup.h in Headers */,
</span><span class="cx"> 2D9EA30D1A96CB59002D2807 /* WKPageInjectedBundleClient.h in Headers */,
</span><span class="lines">@@ -8468,6 +8456,7 @@
</span><span class="cx"> BC8699B5116AADAA002A925B /* WKView.h in Headers */,
</span><span class="cx"> BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */,
</span><span class="cx"> 2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */,
</span><ins>+ 5C1427021C23F84C00D41183 /* Download.h in Headers */,
</ins><span class="cx"> BFA6179F12F0B99D0033E0CA /* WKViewPrivate.h in Headers */,
</span><span class="cx"> C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */,
</span><span class="cx"> C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */,
</span><span class="lines">@@ -8493,6 +8482,7 @@
</span><span class="cx"> 1F7506B51859165400EC0FF7 /* WKWebProcessPlugInScriptWorldInternal.h in Headers */,
</span><span class="cx"> 1A4832CC1A9BC465008B4DFE /* WKWebsiteDataRecord.h in Headers */,
</span><span class="cx"> 1A4832CE1A9BC484008B4DFE /* WKWebsiteDataRecordInternal.h in Headers */,
</span><ins>+ 5C1427041C23F84C00D41183 /* DownloadAuthenticationClient.h in Headers */,
</ins><span class="cx"> 1AA654D11B14F71400BF1D3E /* WKWebsiteDataRecordPrivate.h in Headers */,
</span><span class="cx"> 75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */,
</span><span class="cx"> 75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */,
</span><span class="lines">@@ -9496,13 +9486,13 @@
</span><span class="cx"> 5106D7C218BDBE73000AB166 /* ContextMenuContextData.cpp in Sources */,
</span><span class="cx"> CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */,
</span><span class="cx"> B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
</span><del>- 2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */,
</del><span class="cx"> 2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
</span><span class="cx"> 2984F57C164B915F004BC0C6 /* CustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */,
</span><span class="cx"> 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */,
</span><span class="cx"> 51D0D431183B34130097041D /* DatabaseProcessIDBConnection.cpp in Sources */,
</span><ins>+ 5C1427031C23F84C00D41183 /* DownloadAuthenticationClient.cpp in Sources */,
</ins><span class="cx"> 51D0D436183B353D0097041D /* DatabaseProcessIDBConnectionMessageReceiver.cpp in Sources */,
</span><span class="cx"> E115C714190F89E400ECC516 /* DatabaseProcessIOS.mm in Sources */,
</span><span class="cx"> 51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */,
</span><span class="lines">@@ -9517,12 +9507,7 @@
</span><span class="cx"> 1AC7537F183BE50F0072CB15 /* DataReference.cpp in Sources */,
</span><span class="cx"> 2D3494641BCC2EC30064F0BE /* DeprecatedPDFPlugin.mm in Sources */,
</span><span class="cx"> 83891B6D1A68C30B0030F386 /* DiagnosticLoggingClient.mm in Sources */,
</span><del>- 518E8F0716B2093700E91429 /* Download.cpp in Sources */,
- 518E8F0916B2093700E91429 /* DownloadAuthenticationClient.cpp in Sources */,
</del><span class="cx"> A1DF631218E0B7C8003A3E2A /* DownloadClient.mm in Sources */,
</span><del>- 2DA944A71884E94800ED86DB /* DownloadIOS.mm in Sources */,
- 518E8F0D16B2093700E91429 /* DownloadMac.mm in Sources */,
- 518E8F0B16B2093700E91429 /* DownloadManager.cpp in Sources */,
</del><span class="cx"> 1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */,
</span><span class="cx"> 1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */,
</span><span class="cx"> 1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -9606,6 +9591,7 @@
</span><span class="cx"> 1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */,
</span><span class="cx"> 1A4A9C9A12B821CD008FE984 /* NetscapePluginModuleMac.mm in Sources */,
</span><span class="cx"> 1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */,
</span><ins>+ 5C1427061C23F84C00D41183 /* DownloadManager.cpp in Sources */,
</ins><span class="cx"> E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */,
</span><span class="cx"> E4436ECA1A0D03FA00EAD204 /* NetworkCache.cpp in Sources */,
</span><span class="cx"> E49D40D91AD3FB210066B7B9 /* NetworkCacheBlobStorage.cpp in Sources */,
</span><span class="lines">@@ -9633,7 +9619,6 @@
</span><span class="cx"> 7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */,
</span><span class="cx"> 5183DDEC1630BDFC008BE5C7 /* NetworkProcessConnection.cpp in Sources */,
</span><span class="cx"> 517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */,
</span><del>- 51795570162877CF00FA43B6 /* NetworkProcessCreationParameters.cpp in Sources */,
</del><span class="cx"> 2DA944BD188511E700ED86DB /* NetworkProcessIOS.mm in Sources */,
</span><span class="cx"> 51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */,
</span><span class="cx"> BC82838416B45DA500A278FE /* NetworkProcessMain.mm in Sources */,
</span><span class="lines">@@ -9645,7 +9630,6 @@
</span><span class="cx"> 51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
</span><span class="cx"> 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
</span><span class="cx"> E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
</span><del>- 51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */,
</del><span class="cx"> BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
</span><span class="cx"> 5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
</span><span class="cx"> 31A2EC551489982E00810D71 /* NotificationPermissionRequest.cpp in Sources */,
</span><span class="lines">@@ -9718,6 +9702,7 @@
</span><span class="cx"> BC111B1D112F5FE600337BAB /* ProcessLauncherMac.mm in Sources */,
</span><span class="cx"> 86E67A261910B9D900004AB7 /* ProcessThrottler.cpp in Sources */,
</span><span class="cx"> A118A9EE1907AD6F00F7C92B /* QuickLookDocumentData.cpp in Sources */,
</span><ins>+ 5C1427131C23F89E00D41183 /* DownloadCocoa.mm in Sources */,
</ins><span class="cx"> 2D47B56C1810714E003A3AEE /* RemoteLayerBackingStore.mm in Sources */,
</span><span class="cx"> 2DDF731618E95060004F5A66 /* RemoteLayerBackingStoreCollection.mm in Sources */,
</span><span class="cx"> 1AB16AE9164B3A8800290D62 /* RemoteLayerTreeContext.mm in Sources */,
</span><span class="lines">@@ -9939,6 +9924,7 @@
</span><span class="cx"> BC7B621612A4219A00D174A4 /* WebPageGroupProxy.cpp in Sources */,
</span><span class="cx"> 29D55DF1161BF9F10031A2E3 /* WebPageGroupProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2D9EA3111A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp in Sources */,
</span><ins>+ 5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */,
</ins><span class="cx"> 2DA944BA1884EA3C00ED86DB /* WebPageIOS.mm in Sources */,
</span><span class="cx"> BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */,
</span><span class="cx"> C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -9951,8 +9937,10 @@
</span><span class="cx"> 512127C31908239A00DAF35C /* WebPasteboardOverrides.cpp in Sources */,
</span><span class="cx"> 7C4694D01A51E36800AD5845 /* WebPasteboardProxy.cpp in Sources */,
</span><span class="cx"> 7C4694CC1A4B510A00AD5845 /* WebPasteboardProxyCocoa.mm in Sources */,
</span><ins>+ 5C1426EF1C23F80900D41183 /* NetworkResourceLoadParameters.cpp in Sources */,
</ins><span class="cx"> 7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1A3E736211CC2659007BD539 /* WebPlatformStrategies.cpp in Sources */,
</span><ins>+ 5C1427011C23F84C00D41183 /* Download.cpp in Sources */,
</ins><span class="cx"> C0337DDD127A521C008FF4F4 /* WebPlatformTouchPoint.cpp in Sources */,
</span><span class="cx"> 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
</span><span class="cx"> 31D5929E166E060000E6BF02 /* WebPlugInClient.cpp in Sources */,
</span><span class="lines">@@ -10002,6 +9990,7 @@
</span><span class="cx"> 2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
</span><span class="cx"> BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
</span><span class="cx"> 1AAF08AD1926936700B6390C /* WebUserContentController.cpp in Sources */,
</span><ins>+ 5C14271D1C23F8CF00D41183 /* CustomProtocolManagerCocoa.mm in Sources */,
</ins><span class="cx"> 1AAF08B719269E6D00B6390C /* WebUserContentControllerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 1AAF08A1192681D100B6390C /* WebUserContentControllerProxy.cpp in Sources */,
</span><span class="cx"> 7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */,
</span><span class="lines">@@ -10048,11 +10037,13 @@
</span><span class="cx"> EDCA71B7128DDA8C00201B26 /* WKBundlePageOverlay.cpp in Sources */,
</span><span class="cx"> BC60C57A1240A546008C5E29 /* WKBundleRangeHandle.cpp in Sources */,
</span><span class="cx"> BC14DF9E120B635F00826C0C /* WKBundleScriptWorld.cpp in Sources */,
</span><ins>+ 5C1427121C23F89E00D41183 /* DownloadMac.mm in Sources */,
</ins><span class="cx"> BC4075F5124FF0270068F20A /* WKCertificateInfo.cpp in Sources */,
</span><span class="cx"> BC407628124FF0400068F20A /* WKCertificateInfoMac.mm in Sources */,
</span><span class="cx"> BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
</span><span class="cx"> BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,
</span><span class="cx"> 0FCB4E4D18BBE044000FCFC9 /* WKContentView.mm in Sources */,
</span><ins>+ 5C1427111C23F89E00D41183 /* DownloadIOS.mm in Sources */,
</ins><span class="cx"> 0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */,
</span><span class="cx"> BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */,
</span><span class="cx"> 1AE52F971920263300A1FA37 /* WKContextConfigurationRef.cpp in Sources */,
</span><span class="lines">@@ -10165,7 +10156,6 @@
</span><span class="cx"> BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
</span><span class="cx"> 75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */,
</span><span class="cx"> 1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
</span><del>- 5C9B86131C223EAF00110F36 /* DownloadCocoa.mm in Sources */,
</del><span class="cx"> 513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */,
</span><span class="cx"> BC407605124FF0270068F20A /* WKString.cpp in Sources */,
</span><span class="cx"> BC407619124FF0370068F20A /* WKStringCF.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>