Changeset 81000 in webkit

Timestamp:

Mar 13, 2011 10:47:55 PM (13 years ago)

Author:

beidson@apple.com

Message:

<rdar://problem/9127270> and ​https://bugs.webkit.org/show_bug.cgi?id=56282

Reviewed by Sam Weinig.

Pass the path along with creation parameters:

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:

Add SPI to set the path:

• UIProcess/API/C/WKContext.cpp:

(WKContextSetLocalStorageDirectory):

• UIProcess/API/C/WKContextPrivate.h:

Pass the path along in the process creation parameters:

• UIProcess/WebContext.cpp:

(WebKit::WebContext::ensureWebProcess):
(WebKit::WebContext::localStorageDirectory):

• UIProcess/WebContext.h:

(WebKit::WebContext::setLocalStorageDirectory):

• UIProcess/gtk/WebContextGtk.cpp:

(WebKit::WebContext::platformDefaultLocalStorageDirectory):

• UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::platformDefaultLocalStorageDirectory):

• UIProcess/qt/WebContextQt.cpp:

(WebKit::WebContext::platformDefaultLocalStorageDirectory):

• UIProcess/win/WebContextWin.cpp:

(WebKit::WebContext::platformDefaultLocalStorageDirectory):

Include the path with settings updates, because WebCore needs it set on the Settings object:

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):

• WebProcess/WebProcess.h:

(WebKit::WebProcess::localStorageDirectory):

Sandboxing stuff:

• WebProcess/com.apple.WebProcess.sb:
• WebProcess/mac/WebProcessMac.mm:

(WebKit::initializeSandbox):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (2 diffs)
• UIProcess/WebContext.h (modified) (3 diffs)
• UIProcess/gtk/WebContextGtk.cpp (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (2 diffs)
• UIProcess/qt/WebContextQt.cpp (modified) (1 diff)
• UIProcess/win/WebContextWin.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (2 diffs)
• WebProcess/com.apple.WebProcess.sb (modified) (1 diff)
• WebProcess/mac/WebProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-03-13  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/9127270> and https://bugs.webkit.org/show_bug.cgi?id=56282
+
+        Pass the path along with creation parameters:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+
+        Add SPI to set the path:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetLocalStorageDirectory):
+        * UIProcess/API/C/WKContextPrivate.h:
+
+        Pass the path along in the process creation parameters:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        (WebKit::WebContext::localStorageDirectory):
+        * UIProcess/WebContext.h:
+        (WebKit::WebContext::setLocalStorageDirectory):
+
+        * UIProcess/gtk/WebContextGtk.cpp:
+        (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+        * UIProcess/win/WebContextWin.cpp:
+        (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+
+        Include the path with settings updates, because WebCore needs it set on the Settings object:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        * WebProcess/WebProcess.h:
+        (WebKit::WebProcess::localStorageDirectory):
+
+        Sandboxing stuff:
+        * WebProcess/com.apple.WebProcess.sb:
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::initializeSandbox):
+
 2011-03-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -52 +52 @@
     encoder->encode(applicationCacheDirectory);
     encoder->encode(databaseDirectory);
+    encoder->encode(localStorageDirectory);
     encoder->encode(urlSchemesRegistererdAsEmptyDocument);
     encoder->encode(urlSchemesRegisteredAsSecure);
@@ -92 +93 @@
         return false;
     if (!decoder->decode(parameters.databaseDirectory))
+        return false;
+    if (!decoder->decode(parameters.localStorageDirectory))
         return false;
     if (!decoder->decode(parameters.urlSchemesRegistererdAsEmptyDocument))

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -55 +55 @@
     String applicationCacheDirectory;
     String databaseDirectory;
+    String localStorageDirectory;
     Vector<String> urlSchemesRegistererdAsEmptyDocument;
     Vector<String> urlSchemesRegisteredAsSecure;

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -208 +208 @@
     toImpl(contextRef)->setDatabaseDirectory(toImpl(databaseDirectory)->string());
 }
+
+void WKContextSetLocalStorageDirectory(WKContextRef contextRef, WKStringRef localStorageDirectory)
+{
+    toImpl(contextRef)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());
+}

trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@ -55 +55 @@
 WK_EXPORT void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef context, WKStringRef urlScheme);
 
-// FIXME: This function is only effective if called before the Web process is launched. But
-// we should really change this setting to be on WebPreferences and changeable at runtime.
+// FIXME: These functions are only effective if called before the Web process is launched. But
+// we should really change these settings to be on WebPreferences and changeable at runtime.
 WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);
+WK_EXPORT void WKContextSetLocalStorageDirectory(WKContextRef context, WKStringRef localStorageDirectory);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -223 +223 @@
     parameters.applicationCacheDirectory = applicationCacheDirectory();
     parameters.databaseDirectory = databaseDirectory();
+    parameters.localStorageDirectory = localStorageDirectory();
     parameters.clearResourceCaches = m_clearResourceCachesForNewWebProcess;
     parameters.clearApplicationCache = m_clearApplicationCacheForNewWebProcess;
@@ -730 +731 @@
 }
 
+String WebContext::localStorageDirectory() const
+{
+    if (!m_overrideLocalStorageDirectory.isEmpty())
+        return m_overrideLocalStorageDirectory;
+
+    return platformDefaultLocalStorageDirectory();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -154 +154 @@
 
     void setDatabaseDirectory(const String& dir) { m_overrideDatabaseDirectory = dir; }
+    void setLocalStorageDirectory(const String& dir) { m_overrideLocalStorageDirectory = dir; }
 
     void ensureWebProcess();
@@ -190 +191 @@
     String platformDefaultDatabaseDirectory() const;
 
+    String localStorageDirectory() const;
+    String platformDefaultLocalStorageDirectory() const;
+    
     ProcessModel m_processModel;
     
@@ -238 +242 @@
 
     String m_overrideDatabaseDirectory;
+    String m_overrideLocalStorageDirectory;
 };
 

trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp

@@ -47 +47 @@
 }
 
+String WebContext::platformDefaultLocalStorageDirectory() const
+{
+    return WTF::String::fromUTF8(g_build_filename(g_get_user_data_dir(), "webkit", "localstorage", NULL));
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -36 +36 @@
 NSString *WebDatabaseDirectoryDefaultsKey = @"WebDatabaseDirectory";
 NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
+NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
 
 namespace WebKit {
@@ -108 +109 @@
 }
 
+String WebContext::platformDefaultLocalStorageDirectory() const
+{
+    NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
+    if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
+        localStorageDirectory = @"~/Library/WebKit/LocalStorage";
+    return [localStorageDirectory stringByStandardizingPath];
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp

@@ -54 +54 @@
 }
 
+String WebContext::platformDefaultLocalStorageDirectory() const
+{
+    // FIXME: Implement.
+    return "";
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp

@@ -82 +82 @@
 }
 
+String WebContext::platformDefaultLocalStorageDirectory() const
+{
+    return WebCore::pathByAppendingComponent(WebCore::localUserSpecificStorageDirectory(), "LocalStorage");
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1393 +1393 @@
 #endif
 
+#if ENABLE(DOM_STORAGE)
+    settings->setLocalStorageDatabasePath(WebProcess::shared().localStorageDirectory());
+#endif
+
     platformPreferencesDidChange(store);
 }

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -63 +63 @@
 #include <WebCore/SecurityOrigin.h>
 #include <WebCore/Settings.h>
+#include <WebCore/StorageTracker.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RandomNumber.h>
@@ -176 +177 @@
 #endif
 
+#if ENABLE(DOM_STORAGE)
+    StorageTracker::initializeTracker(parameters.localStorageDirectory);
+    m_localStorageDirectory = parameters.localStorageDirectory;
+#endif
+    
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (!parameters.applicationCacheDirectory.isEmpty())

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -120 +120 @@
 
     void clearResourceCaches(uint32_t cachesToClear = AllResourceCaches);
+    
+    const String& localStorageDirectory() const { return m_localStorageDirectory; }
 
 private:
@@ -205 +207 @@
     TextCheckerState m_textCheckerState;
     WebGeolocationManager m_geolocationManager;
+    
+    String m_localStorageDirectory;
 };
 

trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb

@@ -74 +74 @@
     (allow file* (subpath (param "WEBKIT_DATABASE_DIR"))))
 
+;; LocalStorage dir
+(if (positive? (string-length (param "WEBKIT_LOCALSTORAGE_DIR")))
+    (allow file* (subpath (param "WEBKIT_LOCALSTORAGE_DIR"))))
+    
 ;; The NSURLCache directory.
 (if (positive? (string-length (param "NSURL_CACHE_DIR")))

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -157 +157 @@
     appendSandboxParameterConfPath(sandboxParameters, "DARWIN_USER_CACHE_DIR", _CS_DARWIN_USER_CACHE_DIR);
     appendSandboxParameterPath(sandboxParameters, "WEBKIT_DATABASE_DIR", [(NSString *)parameters.databaseDirectory fileSystemRepresentation]);
+    appendSandboxParameterPath(sandboxParameters, "WEBKIT_LOCALSTORAGE_DIR", [(NSString *)parameters.localStorageDirectory fileSystemRepresentation]);
     appendSandboxParameterPath(sandboxParameters, "NSURL_CACHE_DIR", parameters.nsURLCachePath.data());
     appendSandboxParameterPath(sandboxParameters, "UI_PROCESS_BUNDLE_RESOURCE_DIR", parameters.uiProcessBundleResourcePath.data());