Changeset 96255 in webkit

Timestamp:

Sep 28, 2011 1:46:36 PM (13 years ago)

Author:

adauria@apple.com

Message:

Expose +[WebStorageManager _storageDirectoryPath] as SPI
​https://bugs.webkit.org/show_bug.cgi?id=68951

Reviewed by Brady Eidson.

This patch exposes +[WebStorageManager _storageDirectoryPath], which
pulls the path from NSUserDefaults if the preference is set. Otherwise,
it falls back on the default path.

• Storage/WebStorageManager.mm:

(+[WebStorageManager _storageDirectoryPath]): Adding static variable
so that we don't reread user defaults repeatedly.
(WebKitInitializeStorageIfNecessary):

• Storage/WebStorageManagerPrivate.h:

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Storage/WebStorageManager.mm (modified) (3 diffs)
• Storage/WebStorageManagerPrivate.h (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-09-28  Anton D'Auria  <adauria@apple.com>
+
+        Expose +[WebStorageManager _storageDirectoryPath] as SPI
+        https://bugs.webkit.org/show_bug.cgi?id=68951
+
+        Reviewed by Brady Eidson.
+
+        This patch exposes +[WebStorageManager _storageDirectoryPath], which
+        pulls the path from NSUserDefaults if the preference is set. Otherwise,
+        it falls back on the default path.
+
+        * Storage/WebStorageManager.mm:
+        (+[WebStorageManager _storageDirectoryPath]): Adding static variable
+        so that we don't reread user defaults repeatedly.
+        (WebKitInitializeStorageIfNecessary):
+        * Storage/WebStorageManagerPrivate.h:
+
 2011-09-27  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/mac/Storage/WebStorageManager.mm

@@ -38 +38 @@
 NSString * const WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
 NSString * const WebStorageDidModifyOriginNotification = @"WebStorageDidModifyOriginNotification";
-
-static NSString *storageDirectoryPath();
 
 @implementation WebStorageManager
@@ -91 +89 @@
 }
 
-static NSString *storageDirectoryPath()
++ (NSString *)_storageDirectoryPath
 {
+    static NSString *sLocalStoragePath;
+    
+    if (sLocalStoragePath)
+        return sLocalStoragePath;
+    
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *storageDirectory = [defaults objectForKey:WebStorageDirectoryDefaultsKey];
-    if (!storageDirectory || ![storageDirectory isKindOfClass:[NSString class]])
-        storageDirectory = @"~/Library/WebKit/LocalStorage";
-    
-    return [storageDirectory stringByStandardizingPath];
+    sLocalStoragePath = [defaults objectForKey:WebStorageDirectoryDefaultsKey];
+    if (!sLocalStoragePath || ![sLocalStoragePath isKindOfClass:[NSString class]]) {
+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+        NSString *libraryDirectory = [paths objectAtIndex:0];
+        sLocalStoragePath = [libraryDirectory stringByAppendingPathComponent:@"WebKit/LocalStorage"];
+        [sLocalStoragePath retain];
+    }
+
+    return sLocalStoragePath;
 }
 
@@ -107 +114 @@
         return;
     
-    StorageTracker::initializeTracker(storageDirectoryPath(), WebStorageTrackerClient::sharedWebStorageTrackerClient());
+    StorageTracker::initializeTracker([WebStorageManager _storageDirectoryPath], WebStorageTrackerClient::sharedWebStorageTrackerClient());
         
     initialized = YES;

trunk/Source/WebKit/mac/Storage/WebStorageManagerPrivate.h

@@ -43 +43 @@
 - (void)syncFileSystemAndTrackerDatabase;
 
++ (NSString *)_storageDirectoryPath;
+
 @end