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

Timestamp:

Jun 11, 2015, 5:13:41 PM (10 years ago)

Author:

[email protected]

Message:

Get rid of WebOriginDataManager
​https://bugs.webkit.org/show_bug.cgi?id=145896

Reviewed by Andreas Kling.

• DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::DatabaseProcess): Deleted.
(WebKit::DatabaseProcess::getOrigins): Deleted.
(WebKit::DatabaseProcess::deleteEntriesForOrigin): Deleted.
(WebKit::DatabaseProcess::deleteEntriesModifiedBetweenDates): Deleted.
(WebKit::DatabaseProcess::deleteAllEntries): Deleted.

• DatabaseProcess/DatabaseProcess.h:
• DerivedSources.make:
• UIProcess/API/C/WKAPICast.h:
• UIProcess/API/C/WKContext.cpp:
• UIProcess/Databases/DatabaseProcessProxy.cpp:

(WebKit::DatabaseProcessProxy::didReceiveMessage): Deleted.

• UIProcess/WebOriginDataManagerProxy.cpp: Removed.

(WebKit::WebOriginDataManagerProxy::supplementName): Deleted.
(WebKit::WebOriginDataManagerProxy::create): Deleted.
(WebKit::WebOriginDataManagerProxy::WebOriginDataManagerProxy): Deleted.
(WebKit::WebOriginDataManagerProxy::~WebOriginDataManagerProxy): Deleted.
(WebKit::WebOriginDataManagerProxy::processPoolDestroyed): Deleted.
(WebKit::WebOriginDataManagerProxy::processDidClose): Deleted.
(WebKit::WebOriginDataManagerProxy::shouldTerminate): Deleted.
(WebKit::WebOriginDataManagerProxy::refWebContextSupplement): Deleted.
(WebKit::WebOriginDataManagerProxy::derefWebContextSupplement): Deleted.
(WebKit::CallbackSynchronizer::create): Deleted.
(WebKit::CallbackSynchronizer::~CallbackSynchronizer): Deleted.
(WebKit::CallbackSynchronizer::taskStarted): Deleted.
(WebKit::CallbackSynchronizer::taskCompleted): Deleted.
(WebKit::CallbackSynchronizer::CallbackSynchronizer): Deleted.
(WebKit::createSynchronizedCallback): Deleted.
(WebKit::sendMessageToAllProcessesInProcessPool): Deleted.
(WebKit::WebOriginDataManagerProxy::getOrigins): Deleted.
(WebKit::WebOriginDataManagerProxy::didGetOrigins): Deleted.
(WebKit::WebOriginDataManagerProxy::deleteEntriesForOrigin): Deleted.
(WebKit::WebOriginDataManagerProxy::deleteEntriesModifiedBetweenDates): Deleted.
(WebKit::WebOriginDataManagerProxy::didDeleteEntries): Deleted.
(WebKit::WebOriginDataManagerProxy::deleteAllEntries): Deleted.
(WebKit::WebOriginDataManagerProxy::didDeleteAllEntries): Deleted.

• UIProcess/WebOriginDataManagerProxy.h: Removed.
• UIProcess/WebOriginDataManagerProxy.messages.in: Removed.
• UIProcess/WebProcessPool.cpp:
• WebKit2.xcodeproj/project.pbxproj:
• WebProcess/OriginData/WebOriginDataManager.cpp: Removed.

(WebKit::WebOriginDataManager::WebOriginDataManager): Deleted.
(WebKit::WebOriginDataManager::getOrigins): Deleted.
(WebKit::WebOriginDataManager::deleteEntriesForOrigin): Deleted.
(WebKit::WebOriginDataManager::deleteEntriesModifiedBetweenDates): Deleted.
(WebKit::WebOriginDataManager::deleteAllEntries): Deleted.

• WebProcess/OriginData/WebOriginDataManager.h: Removed.
• WebProcess/OriginData/WebOriginDataManager.messages.in: Removed.
• WebProcess/OriginData/WebOriginDataManagerSupplement.h: Removed.

(WebKit::WebOriginDataManagerSupplement::WebOriginDataManagerSupplement): Deleted.
(WebKit::WebOriginDataManagerSupplement::~WebOriginDataManagerSupplement): Deleted.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:
• WebProcess/WebPage/WebPage.cpp:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::~WebProcess):
(WebKit::WebProcess::WebProcess): Deleted.
(WebKit::WebProcess::getOrigins): Deleted.
(WebKit::WebProcess::deleteEntriesForOrigin): Deleted.
(WebKit::WebProcess::deleteEntriesModifiedBetweenDates): Deleted.
(WebKit::WebProcess::deleteAllEntries): Deleted.

• WebProcess/WebProcess.h:
• WebProcess/cocoa/WebProcessCocoa.mm:

File:

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

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

@@ -31 +31 @@
 #include "ChildProcess.h"
 #include "UniqueIDBDatabaseIdentifier.h"
-#include "WebOriginDataManagerSupplement.h"
 #include <wtf/NeverDestroyed.h>
 
@@ -39 +38 @@
 class DatabaseToWebProcessConnection;
 class UniqueIDBDatabase;
-class WebOriginDataManager;
 
 struct DatabaseProcessCreationParameters;
 
-class DatabaseProcess : public ChildProcess, public WebOriginDataManagerSupplement  {
+class DatabaseProcess : public ChildProcess {
     WTF_MAKE_NONCOPYABLE(DatabaseProcess);
     friend class NeverDestroyed<DatabaseProcess>;
@@ -97 +95 @@
     void ensurePathExists(const String&);
 
-    // WebOriginDataManagerSupplement
-    virtual void getOrigins(WKOriginDataTypes, std::function<void (const Vector<SecurityOriginData>&)> completion) override;
-    virtual void deleteEntriesForOrigin(WKOriginDataTypes, const SecurityOriginData&, std::function<void ()> completion) override;
-    virtual void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void ()> completion) override;
-    virtual void deleteAllEntries(WKOriginDataTypes, std::function<void ()> completion) override;
-
     Vector<RefPtr<DatabaseToWebProcessConnection>> m_databaseToWebProcessConnections;
 
@@ -113 +105 @@
     Deque<std::unique_ptr<AsyncTask>> m_databaseTasks;
     Mutex m_databaseTaskMutex;
-
-    std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
 };