Title: [171156] trunk/Source/WebKit2
- Revision
- 171156
- Author
- [email protected]
- Date
- 2014-07-16 16:08:26 -0700 (Wed, 16 Jul 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171155 => 171156)
--- trunk/Source/WebKit2/ChangeLog 2014-07-16 22:36:24 UTC (rev 171155)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-16 23:08:26 UTC (rev 171156)
@@ -1,3 +1,16 @@
+2014-07-16 Alexey Proskuryakov <[email protected]>
+
+ <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 <[email protected]>
Dispatch top content inset changes immediately if synchronously waiting for view state changes
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (171155 => 171156)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-16 22:36:24 UTC (rev 171155)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-07-16 23:08:26 UTC (rev 171156)
@@ -174,23 +174,21 @@
// 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();
m_presenterApplicationPid = parameters.presenterApplicationPid;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
