Changeset 178526 in webkit

Timestamp:

Jan 15, 2015 1:26:53 PM (9 years ago)

Author:

andersca@apple.com

Message:

Clearing the website data store should clear local storage
​https://bugs.webkit.org/show_bug.cgi?id=140507

Reviewed by Andreas Kling.

• Shared/WebsiteData/WebsiteDataTypes.h:

Add WebsiteDataTypeLocalStorage.

• UIProcess/API/Cocoa/_WKWebsiteDataStore.h:

Add WKWebsiteDataTypeLocalStorage

• UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:

(toWebsiteDataTypes):
Handle WKWebsiteDataTypeLocalStorage.

• UIProcess/Storage/LocalStorageDatabaseTracker.cpp:

(WebKit::fileModificationTime):
Use an early return.

(WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
Change this to take an std::chrono::system_clock::time_point and don't
try to modifiy m_origins while iterating it.

• UIProcess/Storage/LocalStorageDatabaseTracker.h:

Update declarations.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
Change this to take an std::chrono::system_clock::time_point.

• UIProcess/Storage/StorageManager.h:

Update declarations.

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::removeData):
Remove data from the storage manager as well.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebsiteData/WebsiteDataTypes.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStore.h (modified) (1 diff)
• UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (modified) (1 diff)
• UIProcess/Storage/LocalStorageDatabaseTracker.cpp (modified) (2 diffs)
• UIProcess/Storage/LocalStorageDatabaseTracker.h (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (4 diffs)
• UIProcess/Storage/StorageManager.h (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-01-15  Anders Carlsson  <andersca@apple.com>
+
+        Clearing the website data store should clear local storage
+        https://bugs.webkit.org/show_bug.cgi?id=140507
+
+        Reviewed by Andreas Kling.
+
+        * Shared/WebsiteData/WebsiteDataTypes.h:
+        Add WebsiteDataTypeLocalStorage.
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+        Add WKWebsiteDataTypeLocalStorage
+
+        * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+        (toWebsiteDataTypes):
+        Handle WKWebsiteDataTypeLocalStorage.
+
+        * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+        (WebKit::fileModificationTime):
+        Use an early return.
+
+        (WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
+        Change this to take an std::chrono::system_clock::time_point and don't
+        try to modifiy m_origins while iterating it.
+
+        * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+        Update declarations.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::deleteLocalStorageOriginsModifiedSince):
+        Change this to take an std::chrono::system_clock::time_point.
+
+        * UIProcess/Storage/StorageManager.h:
+        Update declarations.
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::removeData):
+        Remove data from the storage manager as well.
+
 2015-01-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h

@@ -32 +32 @@
     WebsiteDataTypeCookies = 1 << 0,
     WebsiteDataTypeDiskCache = 1 << 1,
+    WebsiteDataTypeLocalStorage = 1 << 2,
 };
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h

@@ -34 +34 @@
     WKWebsiteDataTypeDiskCache = 1 << 1,
 
+    WKWebsiteDataTypeLocalStorage = 1 << 2,
     WKWebsiteDataTypeAll = NSUIntegerMax,
 } WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm

@@ -63 +63 @@
     if (wkWebsiteDataTypes & WKWebsiteDataTypeDiskCache)
         websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
+    if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
+        websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
 
     return static_cast<WebsiteDataTypes>(websiteDataTypes);

trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp

@@ -135 +135 @@
 {
     time_t time;
-    return getFileModificationTime(filePath, time) ? time : Optional<time_t>(Nullopt);
-}
-
-Vector<RefPtr<SecurityOrigin>> LocalStorageDatabaseTracker::deleteDatabasesModifiedSince(time_t time)
-{
-    Vector<RefPtr<SecurityOrigin>> deletedDatabaseOrigins;
+    if (!getFileModificationTime(filePath, time))
+        return Nullopt;
+
+    return time;
+}
+
+Vector<Ref<SecurityOrigin>> LocalStorageDatabaseTracker::deleteDatabasesModifiedSince(std::chrono::system_clock::time_point time)
+{
+    Vector<String> originIdentifiersToDelete;
 
     for (const String& origin : m_origins) {
@@ -149 +152 @@
             continue;
 
-        if (modificationTime.value() >= time) {
-            removeDatabaseWithOriginIdentifier(origin);
-
-            deletedDatabaseOrigins.append(SecurityOrigin::createFromDatabaseIdentifier(origin));
-        }
+        if (modificationTime.value() >= std::chrono::system_clock::to_time_t(time))
+            originIdentifiersToDelete.append(origin);
+    }
+
+    Vector<Ref<SecurityOrigin>> deletedDatabaseOrigins;
+    deletedDatabaseOrigins.reserveInitialCapacity(originIdentifiersToDelete.size());
+
+    for (const auto& originIdentifier : originIdentifiersToDelete) {
+        removeDatabaseWithOriginIdentifier(originIdentifier);
+
+        deletedDatabaseOrigins.uncheckedAppend(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
     }
 

trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h

@@ -57 +57 @@
 
     // Returns a vector of the origins whose databases have been deleted.
-    Vector<RefPtr<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(time_t);
+    Vector<Ref<WebCore::SecurityOrigin>> deleteDatabasesModifiedSince(std::chrono::system_clock::time_point);
 
     Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -93 +93 @@
     void didDestroyStorageArea(StorageArea*);
 
-    void clearStorageAreasMatchingOrigin(SecurityOrigin*);
+    void clearStorageAreasMatchingOrigin(const SecurityOrigin&);
     void clearAllStorageAreas();
 
@@ -341 +341 @@
 }
 
-void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(SecurityOrigin* securityOrigin)
-{
-    for (auto it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) {
-        if (it->key->equal(securityOrigin))
-            it->value->clear();
+void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(const SecurityOrigin& securityOrigin)
+{
+    for (const auto& originAndStorageArea : m_storageAreaMap) {
+        if (originAndStorageArea.key->equal(&securityOrigin))
+            originAndStorageArea.value->clear();
     }
 }
@@ -547 +547 @@
     m_queue->dispatch([storageManager, copiedOrigin] {
         for (auto& localStorageNamespace : storageManager->m_localStorageNamespaces.values())
-            localStorageNamespace->clearStorageAreasMatchingOrigin(copiedOrigin.get());
+            localStorageNamespace->clearStorageAreasMatchingOrigin(*copiedOrigin);
 
         for (auto& transientLocalStorageNamespace : storageManager->m_transientLocalStorageNamespaces.values())
@@ -571 +571 @@
 }
 
-void StorageManager::deleteLocalStorageOriginsModifiedSince(time_t time, std::function<void ()> completionHandler)
+void StorageManager::deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point time, std::function<void ()> completionHandler)
 {
     RefPtr<StorageManager> storageManager(this);

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h

@@ -65 +65 @@
     void deleteAllEntries();
 
-    void deleteLocalStorageOriginsModifiedSince(time_t, std::function<void ()> completionHandler);
+    void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
 
 private:

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -174 +174 @@
     }
 
+    if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
+        callbackAggregator->addPendingCallback();
+
+        m_storageManager->deleteLocalStorageOriginsModifiedSince(modifiedSince, [callbackAggregator] {
+            callbackAggregator->removePendingCallback();
+        });
+    }
+
     // There's a chance that we don't have any pending callbacks. If so, we want to dispatch the completion handler right away.
     callbackAggregator->callIfNeeded();