Diff
Modified: trunk/Source/WebKit2/ChangeLog (185478 => 185479)
--- trunk/Source/WebKit2/ChangeLog 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-12 00:13:41 UTC (rev 185479)
@@ -1,3 +1,73 @@
+2015-06-11 Anders Carlsson <ander...@apple.com>
+
+ 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:
+
2015-06-11 Matt Rajca <mra...@apple.com>
Media Session: Add plumbing for media control event delivery.
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (185478 => 185479)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -35,9 +35,6 @@
#include "DatabaseToWebProcessConnection.h"
#include "UniqueIDBDatabase.h"
#include "WebCrossThreadCopier.h"
-#include "WebOriginDataManager.h"
-#include "WebOriginDataManagerMessages.h"
-#include "WebOriginDataManagerProxyMessages.h"
#include "WebsiteData.h"
#include <WebCore/FileSystem.h>
#include <WebCore/NotImplemented.h>
@@ -56,7 +53,6 @@
DatabaseProcess::DatabaseProcess()
: m_queue(WorkQueue::create("com.apple.WebKit.DatabaseProcess"))
- , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(*this, *this))
{
// Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=135365 - Need a more explicit way of doing this besides accessing the UTF8Encoding.
@@ -395,57 +391,6 @@
removeAllDatabasesForOriginPath(originPath, std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max());
}
-void DatabaseProcess::getOrigins(WKOriginDataTypes types, std::function<void (const Vector<SecurityOriginData>&)> completion)
-{
- if (!(types & kWKWebSQLDatabaseOriginData)) {
- completion(Vector<SecurityOriginData>());
- return;
- }
-
- postDatabaseTask(std::make_unique<AsyncTask>([completion, this] {
- completion(getIndexedDatabaseOrigins());
- }));
-}
-
-void DatabaseProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void ()> completion)
-{
- if (!(types & kWKWebSQLDatabaseOriginData)) {
- completion();
- return;
- }
-
- postDatabaseTask(std::make_unique<AsyncTask>([this, origin, completion] {
- deleteIndexedDatabaseEntriesForOrigin(origin);
- completion();
- }));
-}
-
-void DatabaseProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void ()> completion)
-{
- if (!(types & kWKWebSQLDatabaseOriginData)) {
- completion();
- return;
- }
-
- postDatabaseTask(std::make_unique<AsyncTask>([this, startDate, endDate, completion] {
- deleteIndexedDatabaseEntriesModifiedBetweenDates(startDate, endDate);
- completion();
- }));
-}
-
-void DatabaseProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void ()> completion)
-{
- if (!(types & kWKWebSQLDatabaseOriginData)) {
- completion();
- return;
- }
-
- postDatabaseTask(std::make_unique<AsyncTask>([this, completion] {
- deleteAllIndexedDatabaseEntries();
- completion();
- }));
-}
-
#if !PLATFORM(COCOA)
void DatabaseProcess::initializeProcess(const ChildProcessInitializationParameters&)
{
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (185478 => 185479)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-06-12 00:13:41 UTC (rev 185479)
@@ -30,7 +30,6 @@
#include "ChildProcess.h"
#include "UniqueIDBDatabaseIdentifier.h"
-#include "WebOriginDataManagerSupplement.h"
#include <wtf/NeverDestroyed.h>
namespace WebKit {
@@ -38,11 +37,10 @@
class AsyncTask;
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>;
public:
@@ -96,12 +94,6 @@
void performNextDatabaseTask();
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;
Ref<WorkQueue> m_queue;
@@ -112,8 +104,6 @@
Deque<std::unique_ptr<AsyncTask>> m_databaseTasks;
Mutex m_databaseTaskMutex;
-
- std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/DerivedSources.make (185478 => 185479)
--- trunk/Source/WebKit2/DerivedSources.make 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/DerivedSources.make 2015-06-12 00:13:41 UTC (rev 185479)
@@ -125,8 +125,6 @@
WebMediaCacheManager \
WebMediaCacheManagerProxy \
WebNotificationManager \
- WebOriginDataManager \
- WebOriginDataManagerProxy \
WebPage \
WebPageGroupProxy \
WebPageProxy \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-06-12 00:13:41 UTC (rev 185479)
@@ -99,7 +99,6 @@
class WebNotificationProvider;
class WebOpenPanelParameters;
class WebOpenPanelResultListenerProxy;
-class WebOriginDataManagerProxy;
class WebPageGroup;
class WebPageProxy;
class WebPreferences;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -52,7 +52,6 @@
#include "WebKeyValueStorageManager.h"
#include "WebMediaCacheManagerProxy.h"
#include "WebNotificationManagerProxy.h"
-#include "WebOriginDataManagerProxy.h"
#include "WebResourceCacheManagerProxy.h"
#if ENABLE(BATTERY_STATUS)
#include "WebBatteryManagerProxy.h"
Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -28,8 +28,6 @@
#include "DatabaseProcessMessages.h"
#include "DatabaseProcessProxyMessages.h"
-#include "WebOriginDataManagerProxy.h"
-#include "WebOriginDataManagerProxyMessages.h"
#include "WebProcessPool.h"
#include "WebsiteData.h"
#include <WebCore/NotImplemented.h>
@@ -83,11 +81,6 @@
didReceiveDatabaseProcessProxyMessage(connection, decoder);
return;
}
-
- if (decoder.messageReceiverName() == Messages::WebOriginDataManagerProxy::messageReceiverName()) {
- m_processPool->supplement<WebOriginDataManagerProxy>()->didReceiveMessage(connection, decoder);
- return;
- }
}
void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::function<void (WebsiteData)> completionHandler)
Deleted: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebOriginDataManagerProxy.h"
-
-#include "APISecurityOrigin.h"
-#include "SecurityOriginData.h"
-#include "WebOriginDataManagerMessages.h"
-#include "WebOriginDataManagerProxyMessages.h"
-#include "WebProcessPool.h"
-#include <wtf/NeverDestroyed.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebOriginDataManagerProxy::supplementName()
-{
- return "WebOriginDataManagerProxy";
-}
-
-PassRefPtr<WebOriginDataManagerProxy> WebOriginDataManagerProxy::create(WebProcessPool* processPool)
-{
- return adoptRef(new WebOriginDataManagerProxy(processPool));
-}
-
-WebOriginDataManagerProxy::WebOriginDataManagerProxy(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
-{
- processPool->addMessageReceiver(Messages::WebOriginDataManagerProxy::messageReceiverName(), *this);
-}
-
-WebOriginDataManagerProxy::~WebOriginDataManagerProxy()
-{
-}
-
-
-void WebOriginDataManagerProxy::processPoolDestroyed()
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
-}
-
-void WebOriginDataManagerProxy::processDidClose(WebProcessProxy*)
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
-}
-
-bool WebOriginDataManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
- return m_arrayCallbacks.isEmpty();
-}
-
-void WebOriginDataManagerProxy::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebOriginDataManagerProxy::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-class CallbackSynchronizer : public RefCounted<CallbackSynchronizer> {
-public:
- static PassRefPtr<CallbackSynchronizer> create(const std::function<void (const CallbackBase::Error&)>& callback)
- {
- return adoptRef(new CallbackSynchronizer(callback));
- }
-
- ~CallbackSynchronizer()
- {
- ASSERT(!m_count);
- ASSERT(!m_callback);
- }
-
- void taskStarted()
- {
- ++m_count;
- }
-
- void taskCompleted(const CallbackBase::Error& error)
- {
- if (error != CallbackBase::Error::None)
- m_error = error;
-
- ASSERT(m_count);
- if (!--m_count) {
- ASSERT(m_callback);
- m_callback(m_error);
- m_callback = nullptr;
- }
- }
-
-protected:
- CallbackSynchronizer(const std::function<void (const CallbackBase::Error&)>& callback)
- : m_count(0)
- , m_callback(callback)
- , m_error(CallbackBase::Error::None)
- {
- ASSERT(m_callback);
- }
-
- unsigned m_count;
- std::function<void (const CallbackBase::Error&)> m_callback;
- CallbackBase::Error m_error;
-};
-
-static std::pair<RefPtr<CallbackSynchronizer>, VoidCallback::CallbackFunction> createSynchronizedCallback(typename VoidCallback::CallbackFunction callback)
-{
- RefPtr<CallbackSynchronizer> synchronizer = CallbackSynchronizer::create(callback);
- VoidCallback::CallbackFunction synchronizedCallback = [synchronizer](CallbackBase::Error error) {
- synchronizer->taskCompleted(error);
- };
-
- return std::make_pair(synchronizer, synchronizedCallback);
-}
-
-static std::pair<RefPtr<CallbackSynchronizer>, ArrayCallback::CallbackFunction> createSynchronizedCallback(typename ArrayCallback::CallbackFunction callback)
-{
- RefPtr<API::Array> aggregateArray = API::Array::create();
- RefPtr<CallbackSynchronizer> synchronizer = CallbackSynchronizer::create([aggregateArray, callback](const CallbackBase::Error& error) {
- callback(aggregateArray.get(), error);
- });
-
- ArrayCallback::CallbackFunction synchronizedCallback = [aggregateArray, synchronizer](API::Array* array, CallbackBase::Error error) {
- if (array)
- aggregateArray->elements().appendVector(array->elements());
- synchronizer->taskCompleted(error);
- };
-
- return std::make_pair(synchronizer, synchronizedCallback);
-}
-
-template <typename CallbackType, typename MessageType, typename... Parameters>
-static void sendMessageToAllProcessesInProcessPool(WebProcessPool* processPool, typename CallbackType::CallbackFunction callback, HashMap<uint64_t, RefPtr<CallbackType>>& callbackStorage, Parameters... parameters)
-{
- if (!processPool) {
- CallbackType::create(callback)->invalidate();
- return;
- }
-
- auto synchronizerAndCallback = createSynchronizedCallback(callback);
- RefPtr<CallbackSynchronizer> synchronizer = synchronizerAndCallback.first;
- auto perProcessCallback = synchronizerAndCallback.second;
-
- for (auto& process : processPool->processes()) {
- if (!process || !process->canSendMessage())
- continue;
-
- synchronizer->taskStarted();
- RefPtr<CallbackType> callback = CallbackType::create(perProcessCallback);
- uint64_t callbackID = callback->callbackID();
- callbackStorage.set(callbackID, callback.release());
- process->send(MessageType(parameters..., callbackID), 0);
- }
-
- {
- synchronizer->taskStarted();
- RefPtr<CallbackType> callback = CallbackType::create(perProcessCallback);
- uint64_t callbackID = callback->callbackID();
- callbackStorage.set(callbackID, callback.release());
- processPool->sendToDatabaseProcessRelaunchingIfNecessary(MessageType(parameters..., callbackID));
- }
-}
-
-void WebOriginDataManagerProxy::getOrigins(WKOriginDataTypes types, std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- sendMessageToAllProcessesInProcessPool<ArrayCallback, Messages::WebOriginDataManager::GetOrigins>(processPool(), callbackFunction, m_arrayCallbacks, types);
-}
-
-void WebOriginDataManagerProxy::didGetOrigins(IPC::Connection& connection, const Vector<SecurityOriginData>& originIdentifiers, uint64_t callbackID)
-{
- RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
- MESSAGE_CHECK_BASE(callback, &connection);
-
- Vector<RefPtr<API::Object>> securityOrigins;
- securityOrigins.reserveInitialCapacity(originIdentifiers.size());
-
- for (const auto& originIdentifier : originIdentifiers)
- securityOrigins.uncheckedAppend(API::SecurityOrigin::create(originIdentifier.securityOrigin()));
-
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
-}
-
-void WebOriginDataManagerProxy::deleteEntriesForOrigin(WKOriginDataTypes types, API::SecurityOrigin* origin, std::function<void (CallbackBase::Error)> callbackFunction)
-{
- SecurityOriginData securityOriginData;
- securityOriginData.protocol = origin->securityOrigin().protocol();
- securityOriginData.host = origin->securityOrigin().host();
- securityOriginData.port = origin->securityOrigin().port();
-
- sendMessageToAllProcessesInProcessPool<VoidCallback, Messages::WebOriginDataManager::DeleteEntriesForOrigin>(processPool(), callbackFunction, m_voidCallbacks, types, securityOriginData);
-}
-
-void WebOriginDataManagerProxy::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void (CallbackBase::Error)> callbackFunction)
-{
- sendMessageToAllProcessesInProcessPool<VoidCallback, Messages::WebOriginDataManager::DeleteEntriesModifiedBetweenDates>(processPool(), callbackFunction, m_voidCallbacks, types, startDate, endDate);
-}
-
-void WebOriginDataManagerProxy::didDeleteEntries(IPC::Connection& connection, uint64_t callbackID)
-{
- RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
- MESSAGE_CHECK_BASE(callback, &connection);
- callback->performCallback();
-}
-
-void WebOriginDataManagerProxy::deleteAllEntries(WKOriginDataTypes types, std::function<void (CallbackBase::Error)> callbackFunction)
-{
- sendMessageToAllProcessesInProcessPool<VoidCallback, Messages::WebOriginDataManager::DeleteAllEntries>(processPool(), callbackFunction, m_voidCallbacks, types);
-}
-
-void WebOriginDataManagerProxy::didDeleteAllEntries(IPC::Connection& connection, uint64_t callbackID)
-{
- RefPtr<VoidCallback> callback = m_voidCallbacks.take(callbackID);
- MESSAGE_CHECK_BASE(callback, &connection);
- callback->performCallback();
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2015-06-12 00:13:41 UTC (rev 185479)
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebOriginDataManagerProxy_h
-#define WebOriginDataManagerProxy_h
-
-#include "APIObject.h"
-#include "GenericCallback.h"
-#include "MessageReceiver.h"
-#include "WKOriginDataManager.h"
-#include "WebContextSupplement.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-namespace IPC {
-class Connection;
-}
-
-namespace WebKit {
-
-class WebProcessPool;
-struct SecurityOriginData;
-
-typedef GenericCallback<API::Array*> ArrayCallback;
-
-class WebOriginDataManagerProxy : public API::ObjectImpl<API::Object::Type::OriginDataManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebOriginDataManagerProxy> create(WebProcessPool*);
- virtual ~WebOriginDataManagerProxy();
-
- void getOrigins(WKOriginDataTypes, std::function<void (API::Array*, CallbackBase::Error)>);
- void deleteEntriesForOrigin(WKOriginDataTypes, API::SecurityOrigin*, std::function<void (CallbackBase::Error)>);
- void deleteEntriesModifiedBetweenDates(WKOriginDataTypes, double startDate, double endDate, std::function<void (CallbackBase::Error)>);
- void deleteAllEntries(WKOriginDataTypes, std::function<void (CallbackBase::Error)>);
-
- using API::Object::ref;
- using API::Object::deref;
-
- // IPC::MessageReceiver
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
-private:
- explicit WebOriginDataManagerProxy(WebProcessPool*);
-
- void didGetOrigins(IPC::Connection&, const Vector<SecurityOriginData>&, uint64_t callbackID);
- void didDeleteEntries(IPC::Connection&, uint64_t callbackID);
- void didDeleteAllEntries(IPC::Connection&, uint64_t callbackID);
-
- // WebContextSupplement
- virtual void processPoolDestroyed() override;
- virtual void processDidClose(WebProcessProxy*) override;
- virtual bool shouldTerminate(WebProcessProxy*) const override;
- virtual void refWebContextSupplement() override;
- virtual void derefWebContextSupplement() override;
-
- HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
- HashMap<uint64_t, RefPtr<VoidCallback>> m_voidCallbacks;
-};
-
-} // namespace WebKit
-
-#endif // WebOriginDataManagerProxy_h
Deleted: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.messages.in 2015-06-12 00:13:41 UTC (rev 185479)
@@ -1,27 +0,0 @@
-# Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-messages -> WebOriginDataManagerProxy {
- DidGetOrigins(Vector<WebKit::SecurityOriginData> originIdentifiers, uint64_t callbackID) WantsConnection
- DidDeleteEntries(uint64_t callbackID) WantsConnection
- DidDeleteAllEntries(uint64_t callbackID) WantsConnection
-}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185478 => 185479)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -78,7 +78,6 @@
#if ENABLE(DATABASE_PROCESS)
#include "DatabaseProcessCreationParameters.h"
#include "DatabaseProcessMessages.h"
-#include "WebOriginDataManagerProxy.h"
#endif
#if ENABLE(NETWORK_PROCESS)
@@ -208,9 +207,6 @@
#if ENABLE(BATTERY_STATUS)
addSupplement<WebBatteryManagerProxy>();
#endif
-#if ENABLE(DATABASE_PROCESS)
- addSupplement<WebOriginDataManagerProxy>();
-#endif
processPools().append(this);
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185478 => 185479)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-12 00:13:41 UTC (rev 185479)
@@ -1085,10 +1085,6 @@
753E3E0D1887398500188496 /* SessionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 753E3E0B1887397300188496 /* SessionTracker.cpp */; };
753E3E0E1887398900188496 /* SessionTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 753E3E091887394B00188496 /* SessionTracker.h */; };
755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */; };
- 755422C418062BF90046F6A8 /* WebOriginDataManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422BE18062BE40046F6A8 /* WebOriginDataManagerProxy.cpp */; };
- 755422CB180650020046F6A8 /* WebOriginDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */; };
- 755422CC180773CE0046F6A8 /* WebOriginDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */; };
- 759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422BF18062BE40046F6A8 /* WebOriginDataManagerProxy.h */; };
75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
75A8D2C9187CCFAF00C39C9E /* WKWebsiteDataStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */; };
75A8D2D6187D1C0E00C39C9E /* WKWebsiteDataStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */; };
@@ -1096,10 +1092,6 @@
75A8D2D8187D304000C39C9E /* WKSessionRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */; };
75A8D2E1187DEC1A00C39C9E /* APISession.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2DE187DE87400C39C9E /* APISession.h */; };
75A8D2E2187DEC1E00C39C9E /* APISession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75A8D2DD187DE87400C39C9E /* APISession.cpp */; };
- 75E749E9180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75E749E5180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp */; };
- 75E749EA180DBB9800088BA6 /* WebOriginDataManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 75E749E6180DBB9800088BA6 /* WebOriginDataManagerMessages.h */; };
- 75E749EB180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75E749E7180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp */; };
- 75E749EC180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 75E749E8180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h */; };
762B748D120BC75C00819339 /* WKPreferencesRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7801C095142290C400FAF9AF /* WebHitTestResult.cpp */; };
7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 7801C096142290C400FAF9AF /* WebHitTestResult.h */; };
@@ -1722,7 +1714,6 @@
CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */; };
CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
- CDE6E2D319F731C400BA9688 /* WebOriginDataManagerSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */; };
CE1A0BD21A48E6C60054EF74 /* BKSProcessAssertionSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCC1A48E6C60054EF74 /* BKSProcessAssertionSPI.h */; };
CE1A0BD31A48E6C60054EF74 /* CorePDFSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */; };
CE1A0BD41A48E6C60054EF74 /* DataDetectorsUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */; };
@@ -3310,12 +3301,6 @@
753E3E0B1887397300188496 /* SessionTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionTracker.cpp; sourceTree = "<group>"; };
755422B918062B9C0046F6A8 /* WKOriginDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKOriginDataManager.cpp; sourceTree = "<group>"; };
755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOriginDataManager.h; sourceTree = "<group>"; };
- 755422BE18062BE40046F6A8 /* WebOriginDataManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOriginDataManagerProxy.cpp; sourceTree = "<group>"; };
- 755422BF18062BE40046F6A8 /* WebOriginDataManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebOriginDataManagerProxy.h; sourceTree = "<group>"; };
- 755422C018062BE40046F6A8 /* WebOriginDataManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebOriginDataManagerProxy.messages.in; sourceTree = "<group>"; };
- 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebOriginDataManager.cpp; path = OriginData/WebOriginDataManager.cpp; sourceTree = "<group>"; };
- 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManager.h; path = OriginData/WebOriginDataManager.h; sourceTree = "<group>"; };
- 755422C818064FFC0046F6A8 /* WebOriginDataManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebOriginDataManager.messages.in; path = OriginData/WebOriginDataManager.messages.in; sourceTree = "<group>"; };
75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStore.h; sourceTree = "<group>"; };
75A8D2C5187CCF9F00C39C9E /* WKWebsiteDataStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebsiteDataStore.mm; sourceTree = "<group>"; };
75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKSessionRef.cpp; sourceTree = "<group>"; };
@@ -3323,10 +3308,6 @@
75A8D2D4187D1C0100C39C9E /* WKWebsiteDataStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebsiteDataStoreInternal.h; sourceTree = "<group>"; };
75A8D2DD187DE87400C39C9E /* APISession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = APISession.cpp; path = UIProcess/API/APISession.cpp; sourceTree = SOURCE_ROOT; };
75A8D2DE187DE87400C39C9E /* APISession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APISession.h; path = UIProcess/API/APISession.h; sourceTree = SOURCE_ROOT; };
- 75E749E5180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOriginDataManagerMessageReceiver.cpp; sourceTree = "<group>"; };
- 75E749E6180DBB9800088BA6 /* WebOriginDataManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebOriginDataManagerMessages.h; sourceTree = "<group>"; };
- 75E749E7180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOriginDataManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
- 75E749E8180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebOriginDataManagerProxyMessages.h; sourceTree = "<group>"; };
762B7481120BBA0100819339 /* FontSmoothingLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSmoothingLevel.h; sourceTree = "<group>"; };
762B7484120BBA2D00819339 /* WKPreferencesRefPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesRefPrivate.h; sourceTree = "<group>"; };
7801C095142290C400FAF9AF /* WebHitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebHitTestResult.cpp; sourceTree = "<group>"; };
@@ -3998,7 +3979,6 @@
CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFullScreenWindowController.mm; sourceTree = "<group>"; };
CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullScreenWindowController.h; sourceTree = "<group>"; };
CDCA85D4132AC2B300E961DF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
- CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManagerSupplement.h; path = OriginData/WebOriginDataManagerSupplement.h; sourceTree = "<group>"; };
CE1A0BCC1A48E6C60054EF74 /* BKSProcessAssertionSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BKSProcessAssertionSPI.h; sourceTree = "<group>"; };
CE1A0BCD1A48E6C60054EF74 /* CorePDFSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CorePDFSPI.h; sourceTree = "<group>"; };
CE1A0BCE1A48E6C60054EF74 /* DataDetectorsUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsUISPI.h; sourceTree = "<group>"; };
@@ -5936,17 +5916,6 @@
name = mac;
sourceTree = "<group>";
};
- 755422C518064FFC0046F6A8 /* OriginData */ = {
- isa = PBXGroup;
- children = (
- 755422C618064FFC0046F6A8 /* WebOriginDataManager.cpp */,
- 755422C718064FFC0046F6A8 /* WebOriginDataManager.h */,
- 755422C818064FFC0046F6A8 /* WebOriginDataManager.messages.in */,
- CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */,
- );
- name = OriginData;
- sourceTree = "<group>";
- };
7C6E70F818B2D47E00F24E2E /* cocoa */ = {
isa = PBXGroup;
children = (
@@ -6047,7 +6016,6 @@
4A410F4119AF7B27002EBAB5 /* MediaStream */,
5105B0D2162F7A5E00E27709 /* Network */,
31099974146C8AA80029DEB9 /* Notifications (User) */,
- 755422C518064FFC0046F6A8 /* OriginData */,
1A6FB7AA11E64B4900DB1371 /* Plugins */,
3336762B130C9978006C9DE2 /* ResourceCache */,
0F59478C187B3B2A00437857 /* Scrolling */,
@@ -6292,9 +6260,6 @@
7CCCC8F91A5F50FD008FB0DA /* WebNavigationState.h */,
BC1DFEA312B31F87005DF730 /* WebOpenPanelResultListenerProxy.cpp */,
BC1DFEA212B31F87005DF730 /* WebOpenPanelResultListenerProxy.h */,
- 755422BE18062BE40046F6A8 /* WebOriginDataManagerProxy.cpp */,
- 755422BF18062BE40046F6A8 /* WebOriginDataManagerProxy.h */,
- 755422C018062BE40046F6A8 /* WebOriginDataManagerProxy.messages.in */,
8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */,
8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */,
BC7B6205129A0A6700D174A4 /* WebPageGroup.cpp */,
@@ -7375,10 +7340,6 @@
33D3A3C71339617900709BE4 /* WebMediaCacheManagerProxyMessages.h */,
31BA9248148830810062EDB5 /* WebNotificationManagerMessageReceiver.cpp */,
31BA9249148830810062EDB5 /* WebNotificationManagerMessages.h */,
- 75E749E5180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp */,
- 75E749E6180DBB9800088BA6 /* WebOriginDataManagerMessages.h */,
- 75E749E7180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp */,
- 75E749E8180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h */,
29D55DEF161BF9F10031A2E3 /* WebPageGroupProxyMessageReceiver.cpp */,
29D55DF0161BF9F10031A2E3 /* WebPageGroupProxyMessages.h */,
C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */,
@@ -7600,7 +7561,6 @@
7C4ED3291A3119D90079BD49 /* InjectedBundleCSSStyleDeclarationHandle.h in Headers */,
E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */,
- CDE6E2D319F731C400BA9688 /* WebOriginDataManagerSupplement.h in Headers */,
1AF459321946559500F9D4A2 /* WKError.h in Headers */,
1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,
);
@@ -8137,10 +8097,6 @@
BC857FB512B830E600EDEB2E /* WebOpenPanelParameters.h in Headers */,
BC857F8512B82D0B00EDEB2E /* WebOpenPanelResultListener.h in Headers */,
BC1DFEA412B31F87005DF730 /* WebOpenPanelResultListenerProxy.h in Headers */,
- 755422CC180773CE0046F6A8 /* WebOriginDataManager.h in Headers */,
- 75E749EA180DBB9800088BA6 /* WebOriginDataManagerMessages.h in Headers */,
- 759CCD5A1808F6160078E8A8 /* WebOriginDataManagerProxy.h in Headers */,
- 75E749EC180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h in Headers */,
BC032D8F10F437A00058C15A /* WebPage.h in Headers */,
8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */,
BC7B6206129A0A6700D174A4 /* WebPageGroup.h in Headers */,
@@ -9981,10 +9937,6 @@
BC857FB612B830E600EDEB2E /* WebOpenPanelParameters.cpp in Sources */,
BC857F8612B82D0B00EDEB2E /* WebOpenPanelResultListener.cpp in Sources */,
BC857F7E12B82CEE00EDEB2E /* WebOpenPanelResultListenerProxy.cpp in Sources */,
- 755422CB180650020046F6A8 /* WebOriginDataManager.cpp in Sources */,
- 75E749E9180DBB9800088BA6 /* WebOriginDataManagerMessageReceiver.cpp in Sources */,
- 755422C418062BF90046F6A8 /* WebOriginDataManagerProxy.cpp in Sources */,
- 75E749EB180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp in Sources */,
BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */,
C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */,
8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (185478 => 185479)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -27,6 +27,7 @@
#include "config.h"
#include "WebChromeClient.h"
+#include "APIArray.h"
#include "APISecurityOrigin.h"
#include "DrawingArea.h"
#include "InjectedBundleNavigationAction.h"
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (185478 => 185479)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -28,6 +28,7 @@
#include "config.h"
#include "WebPage.h"
+#include "APIArray.h"
#include "APIGeometry.h"
#include "Arguments.h"
#include "DataReference.h"
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (185478 => 185479)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-06-12 00:13:41 UTC (rev 185479)
@@ -52,7 +52,6 @@
#include "WebMediaCacheManager.h"
#include "WebMediaKeyStorageManager.h"
#include "WebMemorySampler.h"
-#include "WebOriginDataManager.h"
#include "WebPage.h"
#include "WebPageGroupProxy.h"
#include "WebPageGroupProxyMessages.h"
@@ -174,7 +173,6 @@
, m_hasRichContentServices(false)
#endif
, m_nonVisibleProcessCleanupTimer(*this, &WebProcess::nonVisibleProcessCleanupTimerFired)
- , m_webOriginDataManager(std::make_unique<WebOriginDataManager>(*this, *this))
#if PLATFORM(IOS)
, m_webSQLiteDatabaseTracker(*this)
#endif
@@ -210,6 +208,10 @@
#endif
}
+WebProcess::~WebProcess()
+{
+}
+
void WebProcess::initializeProcess(const ChildProcessInitializationParameters& parameters)
{
platformInitializeProcess(parameters);
@@ -1438,71 +1440,4 @@
}
#endif
-void WebProcess::getOrigins(WKOriginDataTypes types, std::function<void (const Vector<SecurityOriginData>&)> completion)
-{
- if (!(types & kWKMediaKeyStorageOriginData)) {
- completion(Vector<SecurityOriginData>());
- return;
- }
-
- WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
- if (!manager) {
- completion(Vector<SecurityOriginData>());
- return;
- }
-
- completion(manager->getMediaKeyOrigins());
-}
-
-void WebProcess::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& origin, std::function<void ()> completion)
-{
- if (!(types & kWKMediaKeyStorageOriginData)) {
- completion();
- return;
- }
-
- WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
- if (!manager) {
- completion();
- return;
- }
-
- manager->deleteMediaKeyEntriesForOrigin(origin);
- completion();
-}
-
-void WebProcess::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startDate, double endDate, std::function<void ()> completion)
-{
- if (!(types & kWKMediaKeyStorageOriginData)) {
- completion();
- return;
- }
-
- WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
- if (!manager) {
- completion();
- return;
- }
-
- manager->deleteMediaKeyEntriesModifiedBetweenDates(startDate, endDate);
- completion();
-}
-
-void WebProcess::deleteAllEntries(WKOriginDataTypes types, std::function<void ()> completion)
-{
- if (!(types & kWKMediaKeyStorageOriginData)) {
- completion();
- return;
- }
-
- WebMediaKeyStorageManager* manager = supplement<WebMediaKeyStorageManager>();
- if (!manager) {
- completion();
- return;
- }
-
- manager->deleteAllMediaKeyEntries();
- completion();
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (185478 => 185479)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-06-12 00:13:41 UTC (rev 185479)
@@ -37,7 +37,6 @@
#include "TextCheckerState.h"
#include "ViewUpdateDispatcher.h"
#include "VisitedLinkTable.h"
-#include "WebOriginDataManagerSupplement.h"
#include <WebCore/SessionID.h>
#include <WebCore/Timer.h>
#include <wtf/Forward.h>
@@ -72,14 +71,15 @@
class DownloadManager;
class EventDispatcher;
class InjectedBundle;
+class ObjCObjectGraph;
class UserData;
class WebConnectionToUIProcess;
class WebFrame;
class WebIconDatabaseProxy;
-class WebOriginDataManager;
class WebPage;
class WebPageGroupProxy;
class WebProcessSupplement;
+struct SecurityOriginData;
struct WebPageCreationParameters;
struct WebPageGroupData;
struct WebPreferencesStore;
@@ -94,7 +94,7 @@
class WebToDatabaseProcessConnection;
#endif
-class WebProcess : public ChildProcess, public WebOriginDataManagerSupplement, private DownloadManager::Client {
+class WebProcess : public ChildProcess, private DownloadManager::Client {
friend class NeverDestroyed<DownloadManager>;
public:
static WebProcess& singleton();
@@ -212,6 +212,7 @@
private:
WebProcess();
+ ~WebProcess();
// DownloadManager::Client.
virtual void didCreateDownload() override;
@@ -313,12 +314,6 @@
void didReceiveWebProcessMessage(IPC::Connection&, IPC::MessageDecoder&);
void didReceiveSyncWebProcessMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
- // 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;
-
RefPtr<WebConnectionToUIProcess> m_webConnection;
HashMap<uint64_t, RefPtr<WebPage>> m_pageMap;
@@ -380,7 +375,6 @@
HashSet<uint64_t> m_pagesInWindows;
WebCore::Timer m_nonVisibleProcessCleanupTimer;
- std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
#if PLATFORM(IOS)
WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;
#endif
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (185478 => 185479)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-06-11 22:30:52 UTC (rev 185478)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-06-12 00:13:41 UTC (rev 185479)
@@ -31,6 +31,7 @@
#import "SandboxExtension.h"
#import "SandboxInitializationParameters.h"
#import "SecItemShim.h"
+#import "WKAPICast.h"
#import "WKBrowsingContextHandleInternal.h"
#import "WKFullKeyboardAccessWatcher.h"
#import "WKTypeRefWrapper.h"
