Diff
Modified: trunk/Source/WebKit2/ChangeLog (194210 => 194211)
--- trunk/Source/WebKit2/ChangeLog 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-17 07:07:36 UTC (rev 194211)
@@ -1,3 +1,47 @@
+2015-12-16 Alex Christensen <[email protected]>
+
+ Progress towards implementing downloads with NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=152371
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::downloadRequest):
+ (WebKit::NetworkProcess::resumeDownload):
+ (WebKit::NetworkProcess::cancelDownload):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * Shared/Authentication/AuthenticationManager.cpp:
+ (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+ * Shared/Authentication/AuthenticationManager.h:
+ * Shared/Downloads/Download.cpp:
+ (WebKit::Download::Download):
+ (WebKit::Download::didReceiveAuthenticationChallenge):
+ * Shared/Downloads/Download.h:
+ * Shared/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ (WebKit::DownloadManager::convertHandleToDownload):
+ (WebKit::DownloadManager::resumeDownload):
+ (WebKit::DownloadManager::cancelDownload):
+ (WebKit::DownloadManager::downloadFinished):
+ (WebKit::DownloadManager::didCreateDownload):
+ * Shared/Downloads/DownloadManager.h:
+ * Shared/Downloads/cocoa: Added.
+ * Shared/Downloads/cocoa/DownloadCocoa.mm: Added.
+ (WebKit::Download::start):
+ (WebKit::Download::resume):
+ (WebKit::Download::cancel):
+ (WebKit::Download::platformInvalidate):
+ * Shared/Downloads/ios/DownloadIOS.mm:
+ * Shared/Downloads/mac/DownloadMac.mm:
+ (WebKit::Download::start):
+ (WebKit::Download::startWithHandle):
+ (WebKit::Download::resume):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::resumeDownload):
+ * UIProcess/WebProcessPool.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-12-16 Simon Fraser <[email protected]>
ViewportConfiguration functions should return a bool to say if anything changed
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (194210 => 194211)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-12-17 07:07:36 UTC (rev 194211)
@@ -437,9 +437,9 @@
downloadManager().startDownload(sessionID, downloadID, request);
}
-void NetworkProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
+void NetworkProcess::resumeDownload(SessionID sessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
{
- downloadManager().resumeDownload(downloadID, resumeData, path, sandboxExtensionHandle);
+ downloadManager().resumeDownload(sessionID, downloadID, resumeData, path, sandboxExtensionHandle);
}
void NetworkProcess::cancelDownload(uint64_t downloadID)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (194210 => 194211)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-12-17 07:07:36 UTC (rev 194211)
@@ -150,7 +150,7 @@
void clearDiskCache(std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
void downloadRequest(WebCore::SessionID, uint64_t downloadID, const WebCore::ResourceRequest&);
- void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+ void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
void cancelDownload(uint64_t downloadID);
void setCacheModel(uint32_t);
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (194210 => 194211)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-12-17 07:07:36 UTC (rev 194211)
@@ -40,7 +40,7 @@
DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, WebCore::ResourceRequest request)
- ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+ ResumeDownload(WebCore::SessionID sessionID, uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
CancelDownload(uint64_t downloadID)
SetProcessSuppressionEnabled(bool flag)
Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-12-17 07:07:36 UTC (rev 194211)
@@ -160,7 +160,7 @@
}
#if !USE(NETWORK_SESSION)
-void AuthenticationManager::didReceiveAuthenticationChallenge(Download* download, const AuthenticationChallenge& authenticationChallenge)
+void AuthenticationManager::didReceiveAuthenticationChallenge(Download& download, const AuthenticationChallenge& authenticationChallenge)
{
uint64_t dummyPageID = 0;
uint64_t challengeID = addChallengeToChallengeMap({dummyPageID, authenticationChallenge});
@@ -169,7 +169,7 @@
if (shouldCoalesceChallenge(dummyPageID, challengeID, authenticationChallenge))
return;
- download->send(Messages::DownloadProxy::DidReceiveAuthenticationChallenge(authenticationChallenge, challengeID));
+ download.send(Messages::DownloadProxy::DidReceiveAuthenticationChallenge(authenticationChallenge, challengeID));
}
#endif
Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2015-12-17 07:07:36 UTC (rev 194211)
@@ -61,8 +61,7 @@
void didReceiveAuthenticationChallenge(WebFrame*, const WebCore::AuthenticationChallenge&);
// Called for resources in the NetworkProcess (NetworkProcess enabled)
void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&);
- // Called for downloads with or without the NetworkProcess
- void didReceiveAuthenticationChallenge(Download*, const WebCore::AuthenticationChallenge&);
+ void didReceiveAuthenticationChallenge(Download&, const WebCore::AuthenticationChallenge&);
void useCredentialForChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
void continueWithoutCredentialForChallenge(uint64_t challengeID);
Modified: trunk/Source/WebKit2/Shared/Downloads/Download.cpp (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/Download.cpp 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.cpp 2015-12-17 07:07:36 UTC (rev 194211)
@@ -43,10 +43,17 @@
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);
@@ -70,7 +77,7 @@
#if USE(NETWORK_SESSION)
notImplemented();
#else
- m_downloadManager.downloadsAuthenticationManager().didReceiveAuthenticationChallenge(this, authenticationChallenge);
+ m_downloadManager.downloadsAuthenticationManager().didReceiveAuthenticationChallenge(*this, authenticationChallenge);
#endif
}
Modified: trunk/Source/WebKit2/Shared/Downloads/Download.h (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/Download.h 2015-12-17 07:07:36 UTC (rev 194211)
@@ -53,15 +53,15 @@
#endif
namespace IPC {
- class DataReference;
+class DataReference;
}
namespace WebCore {
- class AuthenticationChallenge;
- class Credential;
- class ResourceError;
- class ResourceHandle;
- class ResourceResponse;
+class AuthenticationChallenge;
+class Credential;
+class ResourceError;
+class ResourceHandle;
+class ResourceResponse;
}
namespace WebKit {
@@ -69,16 +69,23 @@
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)
+#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&);
@@ -128,6 +135,7 @@
#if PLATFORM(COCOA)
#if USE(NETWORK_SESSION)
+ const NetworkSession& m_session;
RetainPtr<NSURLSessionDownloadTask> m_download;
#else
RetainPtr<NSURLDownload> m_nsURLDownload;
Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.cpp 2015-12-17 07:07:36 UTC (rev 194211)
@@ -27,6 +27,7 @@
#include "DownloadManager.h"
#include "Download.h"
+#include "SessionTracker.h"
#include <WebCore/NotImplemented.h>
#include <WebCore/SessionID.h>
#include <wtf/StdLibExtras.h>
@@ -43,14 +44,17 @@
void DownloadManager::startDownload(SessionID sessionID, uint64_t downloadID, const ResourceRequest& request)
{
#if USE(NETWORK_SESSION)
- notImplemented();
+ 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));
-#endif
}
#if !USE(NETWORK_SESSION)
@@ -64,7 +68,7 @@
}
#endif
-void DownloadManager::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
+void DownloadManager::resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
{
#if USE(NETWORK_SESSION)
notImplemented();
@@ -80,25 +84,17 @@
void DownloadManager::cancelDownload(uint64_t downloadID)
{
-#if USE(NETWORK_SESSION)
- notImplemented();
-#else
Download* download = m_downloads.get(downloadID);
if (!download)
return;
download->cancel();
-#endif
}
void DownloadManager::downloadFinished(Download* download)
{
-#if USE(NETWORK_SESSION)
- notImplemented();
-#else
ASSERT(m_downloads.contains(download->downloadID()));
m_downloads.remove(download->downloadID());
-#endif
}
void DownloadManager::didCreateDownload()
Modified: trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/DownloadManager.h 2015-12-17 07:07:36 UTC (rev 194211)
@@ -74,7 +74,7 @@
void convertHandleToDownload(uint64_t downloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
#endif
- void resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
+ void resumeDownload(WebCore::SessionID, uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
void cancelDownload(uint64_t downloadID);
Added: trunk/Source/WebKit2/Shared/Downloads/cocoa/DownloadCocoa.mm (0 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/cocoa/DownloadCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/Downloads/cocoa/DownloadCocoa.mm 2015-12-17 07:07:36 UTC (rev 194211)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+#import "config.h"
+#import "Download.h"
+
+#if USE(NETWORK_SESSION)
+
+#import <WebCore/NotImplemented.h>
+
+namespace WebKit {
+
+void Download::start()
+{
+ notImplemented();
+}
+
+void Download::resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ notImplemented();
+}
+
+void Download::cancel()
+{
+ [m_download cancel];
+}
+
+void Download::platformInvalidate()
+{
+ notImplemented();
+}
+
+}
+
+#endif // USE(NETWORK_SESSION)
Modified: trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2015-12-17 07:07:36 UTC (rev 194211)
@@ -26,7 +26,7 @@
#import "config.h"
#import "Download.h"
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) && !USE(NETWORK_SESSION)
#import "DataReference.h"
#import <WebCore/NotImplemented.h>
Modified: trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm (194210 => 194211)
--- trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2015-12-17 07:07:36 UTC (rev 194211)
@@ -58,10 +58,8 @@
void Download::start()
{
-#if !USE(NETWORK_SESSION)
ASSERT(!m_nsURLDownload);
ASSERT(!m_delegate);
-#endif
m_delegate = adoptNS([[WKDownloadAsDelegate alloc] initWithDownload:this]);
#pragma clang diagnostic push
@@ -73,7 +71,6 @@
[m_nsURLDownload setDeletesFileUponFailure:NO];
}
-#if !USE(NETWORK_SESSION)
void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
{
ASSERT(!m_nsURLDownload);
@@ -89,7 +86,6 @@
// FIXME: Allow this to be changed by the client.
[m_nsURLDownload setDeletesFileUponFailure:NO];
}
-#endif
void Download::resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle& sandboxExtensionHandle)
{
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (194210 => 194211)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-17 07:07:36 UTC (rev 194211)
@@ -786,7 +786,8 @@
SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
if (networkProcess()) {
- networkProcess()->send(Messages::NetworkProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
+ // FIXME: If we started a download in an ephemeral session and that session still exists, we should find a way to use that same session.
+ networkProcess()->send(Messages::NetworkProcess::ResumeDownload(SessionID::defaultSessionID(), downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
return downloadProxy;
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (194210 => 194211)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-12-17 07:07:36 UTC (rev 194211)
@@ -294,8 +294,6 @@
static void willStartUsingPrivateBrowsing();
static void willStopUsingPrivateBrowsing();
- static bool isEphemeralSession(WebCore::SessionID);
-
#if USE(SOUP)
void setIgnoreTLSErrors(bool);
bool ignoreTLSErrors() const { return m_ignoreTLSErrors; }
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194210 => 194211)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-17 06:56:55 UTC (rev 194210)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-17 07:07:36 UTC (rev 194211)
@@ -64,9 +64,9 @@
00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661518E24CBA00CE1F88 /* APIFindClient.h */; };
00B9661918E25AE100CE1F88 /* FindClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 00B9661718E25AE100CE1F88 /* FindClient.mm */; };
00B9661A18E25AE100CE1F88 /* FindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661818E25AE100CE1F88 /* FindClient.h */; };
- 07297F9E1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297F9C1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp */; settings = {ASSET_TAGS = (); }; };
- 07297F9F1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */; settings = {ASSET_TAGS = (); }; };
- 07297FA21C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297FA01C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp */; settings = {ASSET_TAGS = (); }; };
+ 07297F9E1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297F9C1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.cpp */; };
+ 07297F9F1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */; };
+ 07297FA21C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07297FA01C186ADB003F0735 /* WKUserMediaPermissionCheck.cpp */; };
07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297FA11C186ADB003F0735 /* WKUserMediaPermissionCheck.h */; settings = {ATTRIBUTES = (Private, ); }; };
076E884E1A13CADF005E90FC /* APIContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 076E884D1A13CADF005E90FC /* APIContextMenuClient.h */; };
0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F0C365718C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm */; };
@@ -1066,6 +1066,7 @@
528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */; };
5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
+ 5C9B86131C223EAF00110F36 /* DownloadCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */; };
5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A /* WKBundleInspector.cpp */; };
@@ -3257,6 +3258,7 @@
5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
5C20CB9B1BB0DCD200895BB1 /* NetworkSessionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkSessionCocoa.mm; path = NetworkProcess/cocoa/NetworkSessionCocoa.mm; sourceTree = "<group>"; };
5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSession.h; path = NetworkProcess/NetworkSession.h; sourceTree = "<group>"; };
+ 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DownloadCocoa.mm; path = Downloads/cocoa/DownloadCocoa.mm; sourceTree = "<group>"; };
5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerEnvironmentExtractor.h; sourceTree = "<group>"; };
5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynamicLinkerEnvironmentExtractor.mm; sourceTree = "<group>"; };
@@ -5743,6 +5745,7 @@
518E8EF216B208F800E91429 /* Downloads */ = {
isa = PBXGroup;
children = (
+ 5C9B860E1C223E5400110F36 /* cocoa */,
2DA944A51884E93C00ED86DB /* ios */,
518E8F0416B2093700E91429 /* mac */,
518E8EFE16B2093700E91429 /* Download.cpp */,
@@ -5896,6 +5899,14 @@
name = IconDatabase;
sourceTree = "<group>";
};
+ 5C9B860E1C223E5400110F36 /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 5C9B86111C223E7900110F36 /* DownloadCocoa.mm */,
+ );
+ name = cocoa;
+ sourceTree = "<group>";
+ };
6EE849C41368D9040038D481 /* mac */ = {
isa = PBXGroup;
children = (
@@ -10150,6 +10161,7 @@
BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */,
1ADE46B21954EC61000F7985 /* WKSessionStateRef.cpp in Sources */,
+ 5C9B86131C223EAF00110F36 /* DownloadCocoa.mm in Sources */,
513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */,
BC407605124FF0270068F20A /* WKString.cpp in Sources */,
BC407619124FF0370068F20A /* WKStringCF.mm in Sources */,
