Changeset 167143 in webkit

Timestamp:

Apr 11, 2014 1:33:26 PM (10 years ago)

Author:

psolanki@apple.com

Message:

[iOS WebKit2]: Share NSURLCache directory for webkit processes
​https://bugs.webkit.org/show_bug.cgi?id=131513
<rdar://problem/16420859>

Reviewed by Alexey Proskuryakov.

Use iOS specific NSURLCache API to share the cache directory used by the networking process,
web process and Safari.

• NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (2 diffs)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-11  Pratik Solanki  <psolanki@apple.com>
+
+        [iOS WebKit2]: Share NSURLCache directory for webkit processes
+        https://bugs.webkit.org/show_bug.cgi?id=131513
+        <rdar://problem/16420859>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use iOS specific NSURLCache API to share the cache directory used by the networking process,
+        web process and Safari.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-04-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -45 +45 @@
 #endif
 
+#if PLATFORM(IOS)
+@interface NSURLCache (WKDetails)
+-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
+@end
+#endif
+
 namespace WebKit {
 
@@ -55 +61 @@
 void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
 {
+#if PLATFORM(IOS)
+    if (!parameters.uiProcessBundleIdentifier.isNull()) {
+        [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
+            _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
+            diskCapacity:parameters.nsURLCacheDiskCapacity
+            relativePath:parameters.uiProcessBundleIdentifier]).get()];
+    }
+#else
     m_diskCacheDirectory = parameters.diskCacheDirectory;
 
     if (!m_diskCacheDirectory.isNull()) {
         SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
-#if PLATFORM(IOS)
-        NSString *diskCachePath = nil;
-#else
-        NSString *diskCachePath = parameters.diskCacheDirectory;
-#endif
         [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
             initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
             diskCapacity:parameters.nsURLCacheDiskCapacity
-            diskPath:diskCachePath]).get()];
+            diskPath:parameters.diskCacheDirectory]).get()];
     }
+#endif
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090

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

@@ -54 +54 @@
 #import <stdio.h>
 
+#if PLATFORM(IOS)
+@interface NSURLCache (WKDetails)
+-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
+@end
+#endif
+
 using namespace WebCore;
 
@@ -165 +171 @@
     // NSURLCache, which it can disable to save memory.
     if (!usesNetworkProcess()) {
+#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()) {
-#if PLATFORM(IOS)
-            NSString *diskCachePath = nil;
-#else
-            NSString *diskCachePath = parameters.diskCacheDirectory;
-#endif
             [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
                 initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
                 diskCapacity:parameters.nsURLCacheDiskCapacity
-                diskPath:diskCachePath]).get()];
+                diskPath:parameters.diskCacheDirectory]).get()];
         }
+#endif
     }