Changeset 171156 in webkit

Timestamp:

Jul 16, 2014, 4:08:26 PM (11 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/17669097> REGRESSION (r170155): Sandbox violations using a wrong
CFNetwork cache path in WebContent process

Rubber-stamped by Sam Weinig.

Before r170155, we incorrectly checked usesNetworkProcess(), which always returns
false at this point in initialization sequence. But we did the right thing, as we
always need to set the cache path, even when network process is used for most loading.

• WebProcess/cocoa/WebProcessCocoa.mm: (WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-16  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/17669097> REGRESSION (r170155): Sandbox violations using a wrong
+        CFNetwork cache path in WebContent process
+
+        Rubber-stamped by Sam Weinig.
+
+        Before r170155, we incorrectly checked usesNetworkProcess(), which always returns
+        false at this point in initialization sequence. But we did the right thing, as we
+        always need to set the cache path, even when network process is used for most loading.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm: (WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-07-16  Timothy Horton  <timothy_horton@apple.com>
 

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

@@ -175 +175 @@
     // When the network process is enabled, each web process wants a stand-alone
     // NSURLCache, which it can disable to save memory.
-    if (!parameters.usesNetworkProcess) {
 #if PLATFORM(IOS)
-        if (!parameters.uiProcessBundleIdentifier.isNull()) {
-            [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
-                _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
-                diskCapacity:parameters.nsURLCacheDiskCapacity
-                relativePath:parameters.uiProcessBundleIdentifier]).get()];
-        }
+    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
-    }
+    if (!parameters.diskCacheDirectory.isNull()) {
+        [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
+            initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
+            diskCapacity:parameters.nsURLCacheDiskCapacity
+            diskPath:parameters.diskCacheDirectory]).get()];
+    }
+#endif
 
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();