Title: [185374] trunk/Source/WebKit2
- Revision
- 185374
- Author
- [email protected]
- Date
- 2015-06-09 13:12:15 -0700 (Tue, 09 Jun 2015)
Log Message
REGRESSION(r185262): NetworkCache is in wrong location on OS X
https://bugs.webkit.org/show_bug.cgi?id=145812
Reviewed by Anders Carlsson.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory):
(WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory):
(WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory):
(WebKit::WebProcessPool::isNetworkCacheEnabled):
Make sure static functions that use NSUserDefaults call registerUserDefaultsIfNeeded() first.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185373 => 185374)
--- trunk/Source/WebKit2/ChangeLog 2015-06-09 19:55:02 UTC (rev 185373)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 20:12:15 UTC (rev 185374)
@@ -1,3 +1,18 @@
+2015-06-09 Antti Koivisto <[email protected]>
+
+ REGRESSION(r185262): NetworkCache is in wrong location on OS X
+ https://bugs.webkit.org/show_bug.cgi?id=145812
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory):
+ (WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory):
+ (WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory):
+ (WebKit::WebProcessPool::isNetworkCacheEnabled):
+
+ Make sure static functions that use NSUserDefaults call registerUserDefaultsIfNeeded() first.
+
2015-06-09 Yusuke Suzuki <[email protected]>
Crash when passing Symbol to NPAPI plugin objects
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (185373 => 185374)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-06-09 19:55:02 UTC (rev 185373)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-06-09 20:12:15 UTC (rev 185374)
@@ -322,6 +322,8 @@
String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
{
+ registerUserDefaultsIfNeeded();
+
NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
databasesDirectory = @"~/Library/WebKit/Databases";
@@ -339,6 +341,8 @@
String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
{
+ registerUserDefaultsIfNeeded();
+
NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
localStorageDirectory = @"~/Library/WebKit/LocalStorage";
@@ -347,6 +351,8 @@
String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
{
+ registerUserDefaultsIfNeeded();
+
NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
mediaKeysStorageDirectory = @"~/Library/WebKit/MediaKeys";
@@ -398,6 +404,8 @@
bool WebProcessPool::isNetworkCacheEnabled()
{
#if ENABLE(NETWORK_CACHE)
+ registerUserDefaultsIfNeeded();
+
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
bool networkCacheEnabledByDefaults = [defaults boolForKey:WebKitNetworkCacheEnabledDefaultsKey] && ![defaults boolForKey:WebKitNetworkCacheTemporarilyDisabledForTestingKey];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
