Changeset 185374 in webkit


Ignore:
Timestamp:
Jun 9, 2015 1:12:15 PM (9 years ago)
Author:
Antti Koivisto
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.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r185369 r185374  
     12015-06-09  Antti Koivisto  <antti@apple.com>
     2
     3        REGRESSION(r185262): NetworkCache is in wrong location on OS X
     4        https://bugs.webkit.org/show_bug.cgi?id=145812
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     9        (WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory):
     10        (WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory):
     11        (WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory):
     12        (WebKit::WebProcessPool::isNetworkCacheEnabled):
     13
     14            Make sure static functions that use NSUserDefaults call registerUserDefaultsIfNeeded() first.
     15
    1162015-06-09  Yusuke Suzuki  <utatane.tea@gmail.com>
    217
  • trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r185262 r185374  
    323323String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
    324324{
     325    registerUserDefaultsIfNeeded();
     326
    325327    NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
    326328    if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
     
    340342String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory()
    341343{
     344    registerUserDefaultsIfNeeded();
     345
    342346    NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
    343347    if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
     
    348352String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory()
    349353{
     354    registerUserDefaultsIfNeeded();
     355
    350356    NSString *mediaKeysStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebKitMediaKeysStorageDirectoryDefaultsKey];
    351357    if (!mediaKeysStorageDirectory || ![mediaKeysStorageDirectory isKindOfClass:[NSString class]])
     
    399405{
    400406#if ENABLE(NETWORK_CACHE)
     407    registerUserDefaultsIfNeeded();
     408
    401409    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    402410
Note: See TracChangeset for help on using the changeset viewer.