Changeset 185251 in webkit

Timestamp:

Jun 5, 2015 10:19:37 AM (9 years ago)

Author:

andersca@apple.com

Message:

Disable the CFNetwork cache in the web process
​https://bugs.webkit.org/show_bug.cgi?id=145700
rdar://problem/20243343

Reviewed by Geoffrey Garen.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::open):

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
(WebKit::WebProcessCreationParameters::encode): Deleted.
(WebKit::WebProcessCreationParameters::decode): Deleted.

• Shared/WebProcessCreationParameters.h:
• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::createNewWebProcess): Deleted.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Deleted.
(WebKit::WebProcess::initializeWebProcess): Deleted.

• WebProcess/WebProcess.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformClearResourceCaches):
(WebKit::WebProcess::platformInitializeWebProcess):
(WebKit::WebProcess::platformSetCacheModel): Deleted.
(WebKit::WebProcess::platformTerminate): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (5 diffs)
• Shared/WebProcessCreationParameters.h (modified) (2 diffs)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-05  Anders Carlsson  <andersca@apple.com>
+
+        Disable the CFNetwork cache in the web process
+        https://bugs.webkit.org/show_bug.cgi?id=145700
+        rdar://problem/20243343
+
+        Reviewed by Geoffrey Garen.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::open):
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
+        (WebKit::WebProcessCreationParameters::encode): Deleted.
+        (WebKit::WebProcessCreationParameters::decode): Deleted.
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::createNewWebProcess): Deleted.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess): Deleted.
+        (WebKit::WebProcess::initializeWebProcess): Deleted.
+        * WebProcess/WebProcess.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformClearResourceCaches):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        (WebKit::WebProcess::platformSetCacheModel): Deleted.
+        (WebKit::WebProcess::platformTerminate): Deleted.
+
 2015-06-05  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -81 +81 @@
 
     String networkCachePath = WebCore::pathByAppendingComponent(cachePath, networkCacheSubdirectory);
+
     if (!WebCore::makeAllDirectories(networkCachePath))
         return nullptr;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -41 +41 @@
     , defaultRequestTimeoutInterval(INT_MAX)
 #if PLATFORM(COCOA)
-    , nsURLCacheMemoryCapacity(0)
-    , nsURLCacheDiskCapacity(0)
     , shouldEnableKerningAndLigaturesByDefault(false)
     , shouldEnableJIT(false)
@@ -72 +70 @@
     encoder << webSQLDatabaseDirectory;
     encoder << webSQLDatabaseDirectoryExtensionHandle;
-    encoder << diskCacheDirectory;
-    encoder << diskCacheDirectoryExtensionHandle;
 #if ENABLE(SECCOMP_FILTERS)
     encoder << cookieStorageDirectory;
@@ -123 +119 @@
     encoder << presenterApplicationPid;
     encoder << accessibilityEnhancedUserInterfaceEnabled;
-    encoder << nsURLCacheMemoryCapacity;
-    encoder << nsURLCacheDiskCapacity;
     encoder << acceleratedCompositingPort;
     encoder << uiProcessBundleResourcePath;
@@ -179 +173 @@
     if (!decoder.decode(parameters.webSQLDatabaseDirectoryExtensionHandle))
         return false;
-    if (!decoder.decode(parameters.diskCacheDirectory))
-        return false;
-    if (!decoder.decode(parameters.diskCacheDirectoryExtensionHandle))
-        return false;
 #if ENABLE(SECCOMP_FILTERS)
     if (!decoder.decode(parameters.cookieStorageDirectory))
@@ -268 +258 @@
         return false;
     if (!decoder.decode(parameters.accessibilityEnhancedUserInterfaceEnabled))
-        return false;
-    if (!decoder.decode(parameters.nsURLCacheMemoryCapacity))
-        return false;
-    if (!decoder.decode(parameters.nsURLCacheDiskCapacity))
         return false;
     if (!decoder.decode(parameters.acceleratedCompositingPort))

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -73 +73 @@
     String webSQLDatabaseDirectory;
     SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
-    String diskCacheDirectory;
-    SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
 #if ENABLE(SECCOMP_FILTERS)
     String cookieStorageDirectory;
@@ -139 +137 @@
     bool accessibilityEnhancedUserInterfaceEnabled;
 
-    uint64_t nsURLCacheMemoryCapacity;
-    uint64_t nsURLCacheDiskCapacity;
-
     WebCore::MachSendRight acceleratedCompositingPort;
 

trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -175 +175 @@
 #endif
 
-    NSURLCache *urlCache = [NSURLCache sharedURLCache];
-    parameters.nsURLCacheMemoryCapacity = [urlCache memoryCapacity];
-    parameters.nsURLCacheDiskCapacity = [urlCache diskCapacity];
-
     parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
     parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -618 +618 @@
         SandboxExtension::createHandleForReadWriteDirectory(parameters.webSQLDatabaseDirectory, parameters.webSQLDatabaseDirectoryExtensionHandle);
 
-    parameters.diskCacheDirectory = diskCacheDirectory();
-    if (!parameters.diskCacheDirectory.isEmpty())
-        SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
-
 #if ENABLE(SECCOMP_FILTERS)
     parameters.cookieStorageDirectory = this->cookieStorageDirectory();

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -158 +158 @@
     , m_hasSetCacheModel(false)
     , m_cacheModel(CacheModelDocumentViewer)
-    , m_diskCacheIsDisabledForTesting(false)
-#if PLATFORM(COCOA)
-    , m_clearResourceCachesDispatchGroup(0)
-#endif
     , m_fullKeyboardAccessEnabled(false)
     , m_textCheckerState()
@@ -301 +297 @@
         ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
 
-    m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
 

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -339 +339 @@
     bool m_hasSetCacheModel;
     CacheModel m_cacheModel;
-    bool m_diskCacheIsDisabledForTesting;
 
 #if PLATFORM(COCOA)
     WebCore::MachSendRight m_compositingRenderServerPort;
     pid_t m_presenterApplicationPid;
-    dispatch_group_t m_clearResourceCachesDispatchGroup;
 #endif
 

trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

@@ -99 +99 @@
     memoryCache.setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
     PageCache::singleton().setMaxSize(pageCacheSize);
-
-    NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
-
-    [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity];
-    if (!m_diskCacheIsDisabledForTesting)
-        [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn.
 }
 
 void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)
 {
-    if (cachesToClear == InMemoryResourceCachesOnly)
-        return;
-
-    // If we're using the network process then it is the only one that needs to clear the disk cache.
-    if (usesNetworkProcess())
-        return;
-
-    if (!m_clearResourceCachesDispatchGroup)
-        m_clearResourceCachesDispatchGroup = dispatch_group_create();
-
-    dispatch_group_async(m_clearResourceCachesDispatchGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [[NSURLCache sharedURLCache] removeAllCachedResponses];
-    });
+    // FIXME: Remove this.
 }
 
@@ -141 +123 @@
     SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
-    SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
     SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
 #if PLATFORM(IOS)
@@ -154 +135 @@
 #endif
 
-    // FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
-    // - memory cache size passed from UI process is always ignored;
-    // - disk cache size passed from UI process is effectively a minimum size.
-    // One non-obvious constraint is that we need to use -setSharedURLCache: even in testing mode, to prevent creating a default one on disk later, when some other code touches the cache.
-
-    ASSERT(!m_diskCacheIsDisabledForTesting || !parameters.nsURLCacheDiskCapacity);
-
-#if PLATFORM(IOS)
-    if (!parameters.uiProcessBundleIdentifier.isNull()) {
-        [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
-            _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
-            diskCapacity:parameters.nsURLCacheDiskCapacity
-            relativePath:parameters.uiProcessBundleIdentifier]).get()];
-    }
-#else
-    if (!parameters.diskCacheDirectory.isNull()) {
-        [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
-            initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
-            diskCapacity:parameters.nsURLCacheDiskCapacity
-            diskPath:parameters.diskCacheDirectory]).get()];
-    }
-#endif
+    auto urlCache = adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]);
+    [NSURLCache setSharedURLCache:urlCache.get()];
 
 #if PLATFORM(MAC)
@@ -232 +193 @@
 void WebProcess::platformTerminate()
 {
-    if (m_clearResourceCachesDispatchGroup) {
-        dispatch_group_wait(m_clearResourceCachesDispatchGroup, DISPATCH_TIME_FOREVER);
-        dispatch_release(m_clearResourceCachesDispatchGroup);
-        m_clearResourceCachesDispatchGroup = 0;
-    }
 }