Changeset 139931 in webkit

Timestamp:

Jan 16, 2013, 3:23:57 PM (12 years ago)

Author:

ap@apple.com

Message:

WebProcess should not access ~/Library/Caches/com.apple.WebProcess
​https://bugs.webkit.org/show_bug.cgi?id=107055

Reviewed by Anders Carlsson.

• WebProcess/com.apple.WebProcess.sb.in: Remove the rule allowing access.

• WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::platformInitializeWebProcess): Use a correct cache directory even if NetworkProcess is in use. Not all loading has moved to this process yet.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/com.apple.WebProcess.sb.in (modified) (1 diff)
• WebProcess/mac/WebProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-16  Alexey Proskuryakov  <ap@apple.com>
+
+        WebProcess should not access ~/Library/Caches/com.apple.WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=107055
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/com.apple.WebProcess.sb.in: Remove the rule allowing access.
+
+        * WebProcess/mac/WebProcessMac.mm: (WebKit::WebProcess::platformInitializeWebProcess):
+        Use a correct cache directory even if NetworkProcess is in use. Not all loading has
+        moved to this process yet.
+
 2013-01-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in

@@ -90 +90 @@
 ;; Writable preferences and temporary files
 (allow file*
-       (home-subpath "/Library/Caches/com.apple.WebProcess")
        (home-regex #"/Library/Preferences/ByHost/com\.apple\.HIToolbox\.")
        (home-regex #"/Library/Preferences/com\.apple\.WebProcess\.")

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -274 +274 @@
     SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
 
-#if ENABLE(NETWORK_PROCESS)
-    if (!parameters.usesNetworkProcess) {
-#endif
-        if (!parameters.diskCacheDirectory.isNull()) {
-            NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity;
-            NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity;
-
-            RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:parameters.diskCacheDirectory]);
-            [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
-        }
-#if ENABLE(NETWORK_PROCESS)
-    }
-#endif
+    // FIXME (NetworkProcess): This should not be necessary once all loading is in NetworkProcess.
+    if (!parameters.diskCacheDirectory.isNull()) {
+        NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity;
+        NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity;
+
+        RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:parameters.diskCacheDirectory]);
+        [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
+    }
 
     m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;