Title: [179148] trunk/Source/WebKit2
- Revision
- 179148
- Author
- [email protected]
- Date
- 2015-01-26 15:20:30 -0800 (Mon, 26 Jan 2015)
Log Message
Add a user default for disabling network cache
https://bugs.webkit.org/show_bug.cgi?id=140904
Reviewed by Andreas Kling
defaults write com.apple.Safari WebKitNetworkCacheEnabled -bool YES/NO
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179147 => 179148)
--- trunk/Source/WebKit2/ChangeLog 2015-01-26 22:59:40 UTC (rev 179147)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-26 23:20:30 UTC (rev 179148)
@@ -1,3 +1,23 @@
+2015-01-26 Antti Koivisto <[email protected]>
+
+ Add a user default for disabling network cache
+ https://bugs.webkit.org/show_bug.cgi?id=140904
+
+ Reviewed by Andreas Kling
+
+ defaults write com.apple.Safari WebKitNetworkCacheEnabled -bool YES/NO
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+
2015-01-26 Chris Dumez <[email protected]>
First argument to DOM traversal functions should be a reference
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (179147 => 179148)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-26 22:59:40 UTC (rev 179147)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-01-26 23:20:30 UTC (rev 179148)
@@ -64,7 +64,7 @@
if (!m_diskCacheDirectory.isNull()) {
SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
#if ENABLE(NETWORK_CACHE)
- if (NetworkCache::shared().initialize(m_diskCacheDirectory)) {
+ if (parameters.shouldEnableNetworkCache && NetworkCache::shared().initialize(m_diskCacheDirectory)) {
RetainPtr<NSURLCache> urlCache(adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]));
[NSURLCache setSharedURLCache:urlCache.get()];
return;
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (179147 => 179148)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-01-26 22:59:40 UTC (rev 179147)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-01-26 23:20:30 UTC (rev 179148)
@@ -43,6 +43,9 @@
encoder << canHandleHTTPSServerTrustEvaluation;
encoder << diskCacheDirectory;
encoder << diskCacheDirectoryExtensionHandle;
+#if ENABLE(NETWORK_CACHE)
+ encoder << shouldEnableNetworkCache;
+#endif
encoder << cookieStorageDirectory;
#if PLATFORM(IOS)
encoder << cookieStorageDirectoryExtensionHandle;
@@ -80,6 +83,10 @@
return false;
if (!decoder.decode(result.diskCacheDirectoryExtensionHandle))
return false;
+#if ENABLE(NETWORK_CACHE)
+ if (!decoder.decode(result.shouldEnableNetworkCache))
+ return false;
+#endif
if (!decoder.decode(result.cookieStorageDirectory))
return false;
#if PLATFORM(IOS)
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (179147 => 179148)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-01-26 22:59:40 UTC (rev 179147)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-01-26 23:20:30 UTC (rev 179148)
@@ -56,6 +56,9 @@
String diskCacheDirectory;
SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
+#if ENABLE(NETWORK_CACHE)
+ bool shouldEnableNetworkCache;
+#endif
String cookieStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179147 => 179148)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-26 22:59:40 UTC (rev 179147)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-26 23:20:30 UTC (rev 179148)
@@ -79,6 +79,10 @@
static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
#endif
+#if ENABLE(NETWORK_CACHE)
+static NSString * const WebKitNetworkCacheEnabledDefaultsKey = @"WebKitNetworkCacheEnabled";
+#endif
+
namespace WebKit {
NSString *SchemeForCustomProtocolRegisteredNotificationName = @"WebKitSchemeForCustomProtocolRegisteredNotification";
@@ -100,6 +104,10 @@
[registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
#endif
+#if ENABLE(NETWORK_CACHE)
+ [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitNetworkCacheEnabledDefaultsKey];
+#endif
+
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
}
@@ -185,7 +193,7 @@
parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
-
+
#if HAVE(HOSTED_CORE_ANIMATION)
#if !PLATFORM(IOS)
parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
@@ -241,6 +249,10 @@
parameters.httpProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPProxyDefaultsKey];
parameters.httpsProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPSProxyDefaultsKey];
+
+#if ENABLE(NETWORK_CACHE)
+ parameters.shouldEnableNetworkCache = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitNetworkCacheEnabledDefaultsKey];
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
