Changeset 247476 in webkit

Timestamp:

Jul 15, 2019 11:14:57 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove redundant WebsiteDataStoreConfiguration member
​https://bugs.webkit.org/show_bug.cgi?id=199820

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-07-15
Reviewed by Geoffrey Garen.

m_webStorageDirectory was only used for _WKWebsiteDataStoreConfiguration._webStorageDirectory's backing,
which was copied over to m_localStorageDirectory of a new object in WKWebsiteDataStore's _initWithConfiguration.
This is a baby step towards cleaning up this mess with no behavior change. I see no reason to rename the SPI.

• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:

(-[_WKWebsiteDataStoreConfiguration _webStorageDirectory]):
(-[_WKWebsiteDataStoreConfiguration _setWebStorageDirectory:]):

• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:

(WebKit::WebsiteDataStoreConfiguration::copy):

• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:

(WebKit::WebsiteDataStoreConfiguration::webStorageDirectory const): Deleted.
(WebKit::WebsiteDataStoreConfiguration::setWebStorageDirectory): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm (modified) (2 diffs)
• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-15  Alex Christensen  <achristensen@webkit.org>
+
+        Remove redundant WebsiteDataStoreConfiguration member
+        https://bugs.webkit.org/show_bug.cgi?id=199820
+
+        Reviewed by Geoffrey Garen.
+
+        m_webStorageDirectory was only used for _WKWebsiteDataStoreConfiguration._webStorageDirectory's backing,
+        which was copied over to m_localStorageDirectory of a new object in WKWebsiteDataStore's _initWithConfiguration.
+        This is a baby step towards cleaning up this mess with no behavior change.  I see no reason to rename the SPI.
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:
+        (-[_WKWebsiteDataStoreConfiguration _webStorageDirectory]):
+        (-[_WKWebsiteDataStoreConfiguration _setWebStorageDirectory:]):
+        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
+        (WebKit::WebsiteDataStoreConfiguration::copy):
+        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
+        (WebKit::WebsiteDataStoreConfiguration::webStorageDirectory const): Deleted.
+        (WebKit::WebsiteDataStoreConfiguration::setWebStorageDirectory): Deleted.
+
 2019-07-15  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm

@@ -66 +66 @@
 - (NSURL *)_webStorageDirectory
 {
-    return [NSURL fileURLWithPath:_configuration->webStorageDirectory() isDirectory:YES];
+    return [NSURL fileURLWithPath:_configuration->localStorageDirectory() isDirectory:YES];
 }
 
@@ -74 +74 @@
         [NSException raise:NSInvalidArgumentException format:@"Cannot set _webStorageDirectory on a non-persistent _WKWebsiteDataStoreConfiguration."];
     checkURLArgument(url);
-    _configuration->setWebStorageDirectory(url.path);
+    _configuration->setLocalStorageDirectory(url.path);
 }
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

@@ -47 +47 @@
     copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
     copy->m_applicationCacheFlatFileSubdirectoryName = this->m_applicationCacheFlatFileSubdirectoryName;
-    copy->m_webStorageDirectory = this->m_webStorageDirectory;
     copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;
     copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h

@@ -57 +57 @@
     void setJavaScriptConfigurationDirectory(String&& directory) { m_javaScriptConfigurationDirectory = WTFMove(directory); }
     
-    const String& webStorageDirectory() const { return m_webStorageDirectory; }
-    void setWebStorageDirectory(String&& directory) { m_webStorageDirectory = WTFMove(directory); }
-
     const String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
     void setIndexedDBDatabaseDirectory(String&& directory) { m_indexedDBDatabaseDirectory = WTFMove(directory); }
@@ -118 +115 @@
     String m_applicationCacheDirectory;
     String m_applicationCacheFlatFileSubdirectoryName;
-    String m_webStorageDirectory;
     String m_mediaCacheDirectory;
     String m_indexedDBDatabaseDirectory;