Diff
Modified: trunk/Source/WebCore/ChangeLog (197176 => 197177)
--- trunk/Source/WebCore/ChangeLog 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebCore/ChangeLog 2016-02-26 18:17:14 UTC (rev 197177)
@@ -1,3 +1,14 @@
+2016-02-26 Andreas Kling <[email protected]>
+
+ Remove unused CFNetwork disk cache mmap optimization in WebKit2.
+ <https://webkit.org/b/154727>
+
+ Reviewed by Darin Adler.
+
+ Remove some now-unused SPI.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
2016-02-26 Commit Queue <[email protected]>
Unreviewed, rolling out r197167.
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (197176 => 197177)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -111,11 +111,7 @@
EXTERN_C CFURLCacheRef CFURLCacheCopySharedURLCache();
EXTERN_C void CFURLCacheSetMemoryCapacity(CFURLCacheRef, CFIndex memoryCapacity);
-EXTERN_C void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
#if PLATFORM(COCOA)
-EXTERN_C CFBooleanRef _CFURLCacheIsResponseDataMemMapped(CFURLCacheRef, CFDataRef);
-EXTERN_C void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
-
EXTERN_C Boolean _CFNetworkIsKnownHSTSHostWithSession(CFURLRef, CFURLStorageSessionRef);
EXTERN_C void _CFNetworkResetHSTSHostsWithSession(CFURLStorageSessionRef);
#endif
Modified: trunk/Source/WebKit2/ChangeLog (197176 => 197177)
--- trunk/Source/WebKit2/ChangeLog 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-26 18:17:14 UTC (rev 197177)
@@ -1,3 +1,29 @@
+2016-02-26 Andreas Kling <[email protected]>
+
+ Remove unused CFNetwork disk cache mmap optimization in WebKit2.
+ <https://webkit.org/b/154727>
+
+ Reviewed by Darin Adler.
+
+ Nuke all the code related to the mmap optimization we had for CFNetwork's disk cache.
+ This code has not been used since we moved to the WebKit2 network cache.
+
+ * NetworkProcess/Downloads/PendingDownload.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::sendBufferMaybeAborting): Deleted.
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformLowMemoryHandler): Deleted.
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): Deleted.
+ * NetworkProcess/mac/NetworkDiskCacheMonitor.h: Removed.
+ * NetworkProcess/mac/NetworkDiskCacheMonitor.mm: Removed.
+ * NetworkProcess/mac/NetworkLoadMac.mm:
+ (WebKit::NetworkLoad::willCacheResponseAsync): Deleted.
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-02-26 Commit Queue <[email protected]>
Unreviewed, rolling out r197168.
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -59,9 +59,6 @@
virtual void didFinishLoading(double finishTime) override { };
virtual void didFailLoading(const WebCore::ResourceError&) override;
virtual void didBecomeDownload() override;
-#if PLATFORM(COCOA)
- virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
-#endif
// MessageSender.
virtual IPC::Connection* messageSenderConnection() override;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -59,10 +59,6 @@
#if USE(NETWORK_SESSION)
virtual void didBecomeDownload() = 0;
#endif
-
-#if PLATFORM(COCOA)
- virtual void willCacheResponseAsync(CFCachedURLResponseRef) = 0;
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-02-26 18:17:14 UTC (rev 197177)
@@ -479,16 +479,6 @@
{
ASSERT(!isSynchronous());
-#if PLATFORM(COCOA)
- ShareableResource::Handle shareableResourceHandle;
- NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(shareableResourceHandle, buffer);
- if (!shareableResourceHandle.isNull()) {
- send(Messages::WebResourceLoader::DidReceiveResource(shareableResourceHandle, currentTime()));
- abort();
- return false;
- }
-#endif
-
IPC::SharedBufferDataReference dataReference(&buffer);
return sendAbortingOnFailure(Messages::WebResourceLoader::DidReceiveData(dataReference, encodedDataLength));
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -66,19 +66,9 @@
void setDefersLoading(bool);
-#if PLATFORM(COCOA)
- static size_t fileBackedResourceMinimumSize();
- virtual void willCacheResponseAsync(CFCachedURLResponseRef) override;
-#endif
-
// Message handlers.
void didReceiveNetworkResourceLoaderMessage(IPC::Connection&, IPC::MessageDecoder&);
-#if PLATFORM(COCOA)
- static void tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle&, CFCachedURLResponseRef);
- static void tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle&, WebCore::SharedBuffer&);
-#endif
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void continueCanAuthenticateAgainstProtectionSpace(bool);
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -62,9 +62,6 @@
#if USE(NETWORK_SESSION)
virtual void didBecomeDownload() override { ASSERT_NOT_REACHED(); }
#endif
-#if PLATFORM(COCOA)
- virtual void willCacheResponseAsync(CFCachedURLResponseRef) override { }
-#endif
void didComplete();
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2016-02-26 18:17:14 UTC (rev 197177)
@@ -44,7 +44,6 @@
void NetworkProcess::platformLowMemoryHandler(WebCore::Critical)
{
CFURLConnectionInvalidateConnectionCache();
- _CFURLCachePurgeMemoryCache(adoptCF(CFURLCacheCopySharedURLCache()).get());
}
static void initializeNetworkSettings()
@@ -120,12 +119,6 @@
diskCapacity:parameters.nsURLCacheDiskCapacity
diskPath:nsURLCacheDirectory]).get()];
}
-
- RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
- if (!cache)
- return;
-
- _CFURLCacheSetMinSizeForVMCachedResource(cache.get(), NetworkResourceLoader::fileBackedResourceMinimumSize());
}
static uint64_t volumeFreeSize(const String& path)
Deleted: trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.h (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.h 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.h 2016-02-26 18:17:14 UTC (rev 197177)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 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 NetworkDiskCacheMonitor_h
-#define NetworkDiskCacheMonitor_h
-
-#include "MessageSender.h"
-#include <WebCore/DiskCacheMonitorCocoa.h>
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/SessionID.h>
-#include <WebCore/SharedBuffer.h>
-#include <wtf/RunLoop.h>
-
-typedef const struct _CFCachedURLResponse* CFCachedURLResponseRef;
-
-namespace WebKit {
-
-class NetworkConnectionToWebProcess;
-class NetworkResourceLoader;
-
-class NetworkDiskCacheMonitor final : public WebCore::DiskCacheMonitor, private IPC::MessageSender {
-public:
- static void monitorFileBackingStoreCreation(CFCachedURLResponseRef, NetworkResourceLoader*);
-
-private:
- NetworkDiskCacheMonitor(CFCachedURLResponseRef, NetworkResourceLoader*);
-
- // WebCore::DiskCacheMonitor
- virtual void resourceBecameFileBacked(WebCore::SharedBuffer&) override;
-
- // IPC::MessageSender
- virtual IPC::Connection* messageSenderConnection() override;
- virtual uint64_t messageSenderDestinationID() override;
-
- Ref<NetworkConnectionToWebProcess> m_connectionToWebProcess;
-};
-
-
-} // namespace WebKit
-
-#endif // NetworkDiskCacheMonitor_h
Deleted: trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkDiskCacheMonitor.mm 2016-02-26 18:17:14 UTC (rev 197177)
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-#import "config.h"
-#import "NetworkDiskCacheMonitor.h"
-
-#import "NetworkConnectionToWebProcess.h"
-#import "NetworkProcessConnectionMessages.h"
-#import "NetworkResourceLoader.h"
-#import "WebCoreArgumentCoders.h"
-#import <WebCore/CFNetworkSPI.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void NetworkDiskCacheMonitor::monitorFileBackingStoreCreation(CFCachedURLResponseRef cachedResponse, NetworkResourceLoader* loader)
-{
- if (!cachedResponse)
- return;
-
- ASSERT(loader);
-
- new NetworkDiskCacheMonitor(cachedResponse, loader); // Balanced by adoptPtr in the blocks set up in the DiskCacheMonitor constructor, one of which is guaranteed to run.
-}
-
-NetworkDiskCacheMonitor::NetworkDiskCacheMonitor(CFCachedURLResponseRef cachedResponse, NetworkResourceLoader* loader)
- : DiskCacheMonitor(loader->originalRequest(), loader->sessionID(), cachedResponse)
- , m_connectionToWebProcess(loader->connectionToWebProcess())
-{
-}
-
-void NetworkDiskCacheMonitor::resourceBecameFileBacked(SharedBuffer& fileBackedBuffer)
-{
- ShareableResource::Handle handle;
- NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(handle, fileBackedBuffer);
- if (handle.isNull())
- return;
-
- send(Messages::NetworkProcessConnection::DidCacheResource(resourceRequest(), handle, sessionID()));
-}
-
-IPC::Connection* NetworkDiskCacheMonitor::messageSenderConnection()
-{
- return m_connectionToWebProcess->connection();
-}
-
-uint64_t NetworkDiskCacheMonitor::messageSenderDestinationID()
-{
- return 0;
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2016-02-26 18:17:14 UTC (rev 197177)
@@ -40,8 +40,6 @@
{
ASSERT_UNUSED(handle, handle == m_handle);
- m_client.willCacheResponseAsync(cfResponse);
-
m_handle->continueWillCacheResponse(cfResponse);
}
@@ -51,8 +49,6 @@
{
ASSERT_UNUSED(handle, handle == m_handle);
- m_client.willCacheResponseAsync([nsResponse _CFCachedURLResponse]);
-
m_handle->continueWillCacheResponse(nsResponse);
}
Deleted: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (197176 => 197177)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2016-02-26 18:17:14 UTC (rev 197177)
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-#import "config.h"
-#import "NetworkResourceLoader.h"
-
-#import "NetworkDiskCacheMonitor.h"
-#import "ShareableResource.h"
-#import <WebCore/CFNetworkSPI.h>
-#import <WebCore/ResourceHandle.h>
-#import <WebCore/SharedBuffer.h>
-#import <wtf/MainThread.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-static void tryGetShareableHandleFromCFData(ShareableResource::Handle& handle, CFDataRef data)
-{
- RefPtr<SharedMemory> sharedMemory = SharedMemory::create((void*)CFDataGetBytePtr(data), CFDataGetLength(data), SharedMemory::Protection::ReadOnly);
- if (!sharedMemory) {
- LOG_ERROR("Failed to create VM shared memory for cached resource.");
- return;
- }
-
- size_t size = sharedMemory->size();
- RefPtr<ShareableResource> resource = ShareableResource::create(sharedMemory.release(), 0, size);
- resource->createHandle(handle);
-}
-
-void NetworkResourceLoader::tryGetShareableHandleFromCFURLCachedResponse(ShareableResource::Handle& handle, CFCachedURLResponseRef cachedResponse)
-{
- CFDataRef data = ""
-
- tryGetShareableHandleFromCFData(handle, data);
-}
-
-void NetworkResourceLoader::tryGetShareableHandleFromSharedBuffer(ShareableResource::Handle& handle, SharedBuffer& buffer)
-{
- static CFURLCacheRef cache = CFURLCacheCopySharedURLCache();
- ASSERT(isMainThread());
- ASSERT(cache == adoptCF(CFURLCacheCopySharedURLCache()));
-
- if (!cache)
- return;
-
- CFDataRef data = ""
- if (!data)
- return;
-
- if (_CFURLCacheIsResponseDataMemMapped(cache, data) == kCFBooleanFalse)
- return;
-
- tryGetShareableHandleFromCFData(handle, data);
-}
-
-size_t NetworkResourceLoader::fileBackedResourceMinimumSize()
-{
- return SharedMemory::systemPageSize();
-}
-
-void NetworkResourceLoader::willCacheResponseAsync(CFCachedURLResponseRef cfResponse)
-{
- if (m_bytesReceived >= fileBackedResourceMinimumSize())
- NetworkDiskCacheMonitor::monitorFileBackingStoreCreation(cfResponse, this);
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (197176 => 197177)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 18:12:53 UTC (rev 197176)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 18:17:14 UTC (rev 197177)
@@ -917,8 +917,6 @@
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
- 5167EEA0170377BF007681CA /* NetworkDiskCacheMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */; };
- 5167EEA1170377BF007681CA /* NetworkDiskCacheMonitor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */; };
516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* APIError.h */; };
51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */; };
51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7DF16138E2900D03ED3 /* NetworkProcess.cpp */; };
@@ -981,7 +979,6 @@
51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51E351FD180F5D0B00E53BE9 /* DatabaseToWebProcessConnection.cpp */; };
51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */; };
51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */; };
- 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */; };
51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */; };
51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
@@ -2901,8 +2898,6 @@
516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
5164C0941B05B757004F102A /* ChildProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChildProcess.messages.in; sourceTree = "<group>"; };
- 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDiskCacheMonitor.h; sourceTree = "<group>"; };
- 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkDiskCacheMonitor.mm; sourceTree = "<group>"; };
516A4A5B120A2CCD00C05B7F /* APIError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIError.h; sourceTree = "<group>"; };
517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKApplicationCacheManager.cpp; sourceTree = "<group>"; };
517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKApplicationCacheManager.h; sourceTree = "<group>"; };
@@ -2976,7 +2971,6 @@
51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseProcessMac.mm; sourceTree = "<group>"; };
51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };
- 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkResourceLoaderMac.mm; sourceTree = "<group>"; };
51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5221,11 +5215,8 @@
isa = PBXGroup;
children = (
E17AE2C116B9C139001C42F1 /* com.apple.WebKit.NetworkProcess.sb.in */,
- 5167EE9E170377BF007681CA /* NetworkDiskCacheMonitor.h */,
- 5167EE9F170377BF007681CA /* NetworkDiskCacheMonitor.mm */,
836EEB7F1BE9EC9E006B4B82 /* NetworkLoadMac.mm */,
51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */,
- 51E3B67E16F266B3009968DC /* NetworkResourceLoaderMac.mm */,
E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */,
);
name = mac;
@@ -7368,7 +7359,6 @@
8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */,
513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
51DD9F2916367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h in Headers */,
- 5167EEA0170377BF007681CA /* NetworkDiskCacheMonitor.h in Headers */,
839902031BE9A02B000F3653 /* NetworkLoad.h in Headers */,
83D454D71BE9D3C4006C93BD /* NetworkLoadClient.h in Headers */,
839149651BEA838500D2D953 /* NetworkLoadParameters.h in Headers */,
@@ -8808,7 +8798,6 @@
8310428C1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.cpp in Sources */,
513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */,
51DD9F2816367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp in Sources */,
- 5167EEA1170377BF007681CA /* NetworkDiskCacheMonitor.mm in Sources */,
839902021BE9A02B000F3653 /* NetworkLoad.cpp in Sources */,
836EEB801BE9EC9E006B4B82 /* NetworkLoadMac.mm in Sources */,
839149641BEA838500D2D953 /* NetworkLoadParameters.cpp in Sources */,
@@ -8825,7 +8814,6 @@
513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */,
- 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
5C20CB9D1BB0DCFA00895BB1 /* NetworkSessionCocoa.mm in Sources */,
