Changeset 185521 in webkit for trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

Timestamp:

Jun 12, 2015, 3:04:27 PM (10 years ago)

Author:

[email protected]

Message:

Clean up IndexedDB website data retrieval and removal
​https://bugs.webkit.org/show_bug.cgi?id=145941

Reviewed by Andreas Kling.

• Use SecurityOrigin instead of SecurityOriginData; It's not possible to pass SecurityOriginData

safely between threads.

• Use std::chrono instead of double for modification times.

• Get rid of endTime since it's not used.

• Change deleteIndexedDatabaseEntriesForOrigin to deleteIndexedDatabaseEntriesForOrigins and make it take

a vector of origins instead of a single one.

• Get rid of deleteAllIndexedDatabaseEntries.

• Change SecurityOriginData::securityOrigin to call isolatedCopy on the origin components, since it's common

to pass origins to other threads and we want that to be safe.

• DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::fetchWebsiteData):
(WebKit::DatabaseProcess::deleteWebsiteData):
(WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
(WebKit::DatabaseProcess::indexedDatabaseOrigins):
(WebKit::removeAllDatabasesForOriginPath):
(WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesForOrigins):
(WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesModifiedSince):
(WebKit::DatabaseProcess::getIndexedDatabaseOrigins): Deleted.
(WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesForOrigin): Deleted.
(WebKit::DatabaseProcess::deleteIndexedDatabaseEntriesModifiedBetweenDates): Deleted.
(WebKit::DatabaseProcess::deleteAllIndexedDatabaseEntries): Deleted.

• DatabaseProcess/DatabaseProcess.h:
• Shared/SecurityOriginData.cpp:

(WebKit::SecurityOriginData::securityOrigin):

File:

• trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (modified) (2 diffs)

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

@@ -58 +58 @@
     WorkQueue& queue() { return m_queue.get(); }
 
-    Vector<SecurityOriginData> getIndexedDatabaseOrigins();
-    void deleteIndexedDatabaseEntriesForOrigin(const SecurityOriginData&);
-    void deleteIndexedDatabaseEntriesModifiedBetweenDates(double startDate, double endDate);
-    void deleteAllIndexedDatabaseEntries();
-
     void postDatabaseTask(std::unique_ptr<AsyncTask>);
 
@@ -91 +86 @@
     void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, uint64_t callbackID);
 
+    Vector<RefPtr<WebCore::SecurityOrigin>> indexedDatabaseOrigins();
+    void deleteIndexedDatabaseEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&);
+    void deleteIndexedDatabaseEntriesModifiedSince(std::chrono::system_clock::time_point modifiedSince);
+
     // For execution on work queue thread only
     void performNextDatabaseTask();