Title: [184295] trunk/Source/WebKit2
- Revision
- 184295
- Author
- [email protected]
- Date
- 2015-05-13 12:24:10 -0700 (Wed, 13 May 2015)
Log Message
Rename some StorageManager functions to indicate that they work on local storage entries
https://bugs.webkit.org/show_bug.cgi?id=144958
First part of rdar://problem/10690447.
Reviewed by Beth Dakin.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::getLocalStorageOrigins):
(WebKit::StorageManager::getLocalStorageDetailsByOrigin):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
(WebKit::StorageManager::deleteAllLocalStorageEntries):
(WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
(WebKit::StorageManager::getOrigins): Deleted.
(WebKit::StorageManager::getStorageDetailsByOrigin): Deleted.
(WebKit::StorageManager::deleteEntriesForOrigin): Deleted.
(WebKit::StorageManager::deleteAllEntries): Deleted.
(WebKit::StorageManager::deleteEntriesForOrigins): Deleted.
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
(WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
(WebKit::WebKeyValueStorageManager::deleteAllEntries):
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184294 => 184295)
--- trunk/Source/WebKit2/ChangeLog 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-13 19:24:10 UTC (rev 184295)
@@ -1,3 +1,32 @@
+2015-05-13 Anders Carlsson <[email protected]>
+
+ Rename some StorageManager functions to indicate that they work on local storage entries
+ https://bugs.webkit.org/show_bug.cgi?id=144958
+ First part of rdar://problem/10690447.
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::getLocalStorageOrigins):
+ (WebKit::StorageManager::getLocalStorageDetailsByOrigin):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigin):
+ (WebKit::StorageManager::deleteAllLocalStorageEntries):
+ (WebKit::StorageManager::deleteLocalStorageEntriesForOrigins):
+ (WebKit::StorageManager::getOrigins): Deleted.
+ (WebKit::StorageManager::getStorageDetailsByOrigin): Deleted.
+ (WebKit::StorageManager::deleteEntriesForOrigin): Deleted.
+ (WebKit::StorageManager::deleteAllEntries): Deleted.
+ (WebKit::StorageManager::deleteEntriesForOrigins): Deleted.
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteAllEntries):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+
2015-05-13 Joseph Pecoraro <[email protected]>
Crash under WebKit::WebInspectorProxy::attachAvailabilityChanged sometimes opening new page
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (184294 => 184295)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-05-13 19:24:10 UTC (rev 184295)
@@ -514,7 +514,7 @@
});
}
-void StorageManager::getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
+void StorageManager::getLocalStorageOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler)
{
RefPtr<StorageManager> storageManager(this);
@@ -527,7 +527,7 @@
});
}
-void StorageManager::getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
+void StorageManager::getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler)
{
RefPtr<StorageManager> storageManager(this);
@@ -540,7 +540,7 @@
});
}
-void StorageManager::deleteEntriesForOrigin(const SecurityOrigin& securityOrigin)
+void StorageManager::deleteLocalStorageEntriesForOrigin(const SecurityOrigin& securityOrigin)
{
RefPtr<StorageManager> storageManager(this);
@@ -556,7 +556,7 @@
});
}
-void StorageManager::deleteAllEntries()
+void StorageManager::deleteAllLocalStorageEntries()
{
RefPtr<StorageManager> storageManager(this);
@@ -590,7 +590,7 @@
});
}
-void StorageManager::deleteEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
+void StorageManager::deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
{
Vector<RefPtr<WebCore::SecurityOrigin>> copiedOrigins;
copiedOrigins.reserveInitialCapacity(origins.size());
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (184294 => 184295)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2015-05-13 19:24:10 UTC (rev 184295)
@@ -57,13 +57,13 @@
void processDidCloseConnection(WebProcessProxy&, IPC::Connection&);
void applicationWillTerminate();
- void getOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
- void getStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
- void deleteEntriesForOrigin(const WebCore::SecurityOrigin&);
- void deleteAllEntries();
+ void getLocalStorageOrigins(std::function<void (Vector<RefPtr<WebCore::SecurityOrigin>>)> completionHandler);
+ void getLocalStorageDetailsByOrigin(std::function<void (Vector<LocalStorageDetails>)> completionHandler);
+ void deleteLocalStorageEntriesForOrigin(const WebCore::SecurityOrigin&);
+ void deleteAllLocalStorageEntries();
void deleteLocalStorageOriginsModifiedSince(std::chrono::system_clock::time_point, std::function<void ()> completionHandler);
- void deleteEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
+ void deleteLocalStorageEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&, std::function<void ()> completionHandler);
private:
explicit StorageManager(const String& localStorageDirectory);
Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (184294 => 184295)
--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 19:24:10 UTC (rev 184295)
@@ -98,7 +98,7 @@
return;
}
- storageManager->getOrigins([callbackFunction](Vector<RefPtr<SecurityOrigin>> securityOrigins) {
+ storageManager->getLocalStorageOrigins([callbackFunction](Vector<RefPtr<SecurityOrigin>> securityOrigins) {
Vector<RefPtr<API::Object>> webSecurityOrigins;
webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
for (auto& origin : securityOrigins)
@@ -118,7 +118,7 @@
return;
}
- storageManager->getStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
+ storageManager->getLocalStorageDetailsByOrigin([callbackFunction](Vector<LocalStorageDetails> storageDetails) {
HashMap<String, RefPtr<API::Object>> detailsMap;
Vector<RefPtr<API::Object>> result;
result.reserveInitialCapacity(storageDetails.size());
@@ -147,7 +147,7 @@
if (!storageManager)
return;
- storageManager->deleteEntriesForOrigin(origin->securityOrigin());
+ storageManager->deleteLocalStorageEntriesForOrigin(origin->securityOrigin());
}
void WebKeyValueStorageManager::deleteAllEntries()
@@ -156,7 +156,7 @@
if (!storageManager)
return;
- storageManager->deleteAllEntries();
+ storageManager->deleteAllLocalStorageEntries();
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (184294 => 184295)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-13 19:20:42 UTC (rev 184294)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-05-13 19:24:10 UTC (rev 184295)
@@ -269,7 +269,7 @@
if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
callbackAggregator->addPendingCallback();
- m_storageManager->getOrigins([callbackAggregator](Vector<RefPtr<WebCore::SecurityOrigin>> origins) {
+ m_storageManager->getLocalStorageOrigins([callbackAggregator](Vector<RefPtr<WebCore::SecurityOrigin>> origins) {
WebsiteData websiteData;
for (auto& origin : origins)
websiteData.entries.append(WebsiteData::Entry { WTF::move(origin), WebsiteDataTypeLocalStorage });
@@ -616,7 +616,7 @@
if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
callbackAggregator->addPendingCallback();
- m_storageManager->deleteEntriesForOrigins(origins, [callbackAggregator] {
+ m_storageManager->deleteLocalStorageEntriesForOrigins(origins, [callbackAggregator] {
callbackAggregator->removePendingCallback();
});
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
