Title: [187294] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187294
- Author
- [email protected]
- Date
- 2015-07-23 23:10:28 -0700 (Thu, 23 Jul 2015)
Log Message
Merged r187045. rdar://problem/21433691
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187293 => 187294)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 06:06:21 UTC (rev 187293)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 06:10:28 UTC (rev 187294)
@@ -1,5 +1,26 @@
2015-07-23 Lucas Forschler <[email protected]>
+ Merge r187045
+
+ 2015-07-20 Antti Koivisto <[email protected]>
+
+ NSURLCache fallback does not work on iOS due to sandboxing
+ https://bugs.webkit.org/show_bug.cgi?id=146314
+ <rdar://problem/21433691>
+
+ Reviewed by Anders Carlsson.
+
+ This broke with earlier cache path computation changes.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+
+ NSURLCache path is relative to the container cache path so "." is sufficient.
+ This puts the cache files under
+ <container>/Library/Caches/com.apple.WebKit.Networking/
+
+2015-07-23 Lucas Forschler <[email protected]>
+
Merge r186977
2015-07-17 Enrica Casucci <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (187293 => 187294)
--- branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-07-24 06:06:21 UTC (rev 187293)
+++ branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-07-24 06:10:28 UTC (rev 187294)
@@ -101,17 +101,16 @@
return;
}
#endif
+ String nsURLCacheDirectory = m_diskCacheDirectory;
#if PLATFORM(IOS)
+ // NSURLCache path is relative to network process cache directory.
+ // This puts cache files under <container>/Library/Caches/com.apple.WebKit.Networking/
+ nsURLCacheDirectory = ".";
+#endif
[NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
- _initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
- diskCapacity:parameters.nsURLCacheDiskCapacity
- relativePath:parameters.uiProcessBundleIdentifier]).get()];
-#else
- [NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
diskCapacity:parameters.nsURLCacheDiskCapacity
- diskPath:parameters.diskCacheDirectory]).get()];
-#endif
+ diskPath:nsURLCacheDirectory]).get()];
}
RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
