Title: [166387] trunk/Source/WebKit2
- Revision
- 166387
- Author
- psola...@apple.com
- Date
- 2014-03-27 17:27:27 -0700 (Thu, 27 Mar 2014)
Log Message
[iOS WebKit2] Don't pass disk cache directory path on iOS
https://bugs.webkit.org/show_bug.cgi?id=130862
Reviewed by Sam Weinig.
The diskPath passed to NSURLCache initializer is treated differently on Mac and iOS. Just
pass nil for now until we sort out the API.
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166386 => 166387)
--- trunk/Source/WebKit2/ChangeLog 2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-28 00:27:27 UTC (rev 166387)
@@ -1,5 +1,20 @@
2014-03-27 Pratik Solanki <psola...@apple.com>
+ [iOS WebKit2] Don't pass disk cache directory path on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=130862
+
+ Reviewed by Sam Weinig.
+
+ The diskPath passed to NSURLCache initializer is treated differently on Mac and iOS. Just
+ pass nil for now until we sort out the API.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
+2014-03-27 Pratik Solanki <psola...@apple.com>
+
[iOS WebKit2] Share network process code between iOS and Mac
https://bugs.webkit.org/show_bug.cgi?id=130861
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (166386 => 166387)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-03-28 00:27:27 UTC (rev 166387)
@@ -56,10 +56,15 @@
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:parameters.diskCacheDirectory]).get()];
+ diskPath:diskCachePath]).get()];
}
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (166386 => 166387)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-03-27 23:52:23 UTC (rev 166386)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-03-28 00:27:27 UTC (rev 166387)
@@ -165,10 +165,15 @@
// NSURLCache, which it can disable to save memory.
if (!usesNetworkProcess()) {
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:parameters.diskCacheDirectory]).get()];
+ diskPath:diskCachePath]).get()];
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
