Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (194294 => 194295)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-12-18 22:34:49 UTC (rev 194295)
@@ -361,8 +361,6 @@
UIProcess/WebContextMenuProxy.cpp
UIProcess/WebCookieManagerProxy.cpp
UIProcess/WebCookieManagerProxyClient.cpp
- UIProcess/WebDatabaseManagerProxy.cpp
- UIProcess/WebDatabaseManagerProxyClient.cpp
UIProcess/WebEditCommandProxy.cpp
UIProcess/WebFormClient.cpp
UIProcess/WebFormSubmissionListenerProxy.cpp
@@ -419,7 +417,6 @@
UIProcess/API/C/WKContextConfigurationRef.cpp
UIProcess/API/C/WKCookieManager.cpp
UIProcess/API/C/WKCredential.cpp
- UIProcess/API/C/WKDatabaseManager.cpp
UIProcess/API/C/WKDownload.cpp
UIProcess/API/C/WKFormSubmissionListener.cpp
UIProcess/API/C/WKFrame.cpp
@@ -598,7 +595,6 @@
WebProcess/WebCoreSupport/WebChromeClient.cpp
WebProcess/WebCoreSupport/WebColorChooser.cpp
WebProcess/WebCoreSupport/WebContextMenuClient.cpp
- WebProcess/WebCoreSupport/WebDatabaseManager.cpp
WebProcess/WebCoreSupport/WebDeviceProximityClient.cpp
WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp
WebProcess/WebCoreSupport/WebDragClient.cpp
@@ -666,7 +662,6 @@
UIProcess/VisitedLinkStore.messages.in
UIProcess/WebBatteryManagerProxy.messages.in
UIProcess/WebCookieManagerProxy.messages.in
- UIProcess/WebDatabaseManagerProxy.messages.in
UIProcess/WebFullScreenManagerProxy.messages.in
UIProcess/WebGeolocationManagerProxy.messages.in
UIProcess/WebIconDatabase.messages.in
@@ -721,8 +716,6 @@
WebProcess/UserContent/WebUserContentController.messages.in
- WebProcess/WebCoreSupport/WebDatabaseManager.messages.in
-
WebProcess/WebPage/DrawingArea.messages.in
WebProcess/WebPage/EventDispatcher.messages.in
WebProcess/WebPage/VisitedLinkTableController.messages.in
Modified: trunk/Source/WebKit2/ChangeLog (194294 => 194295)
--- trunk/Source/WebKit2/ChangeLog 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,3 +1,102 @@
+2015-12-15 Anders Carlsson <[email protected]>
+
+ Get rid of WebDatabaseManager, it's been replaced by WebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=152318
+
+ Reviewed by Tim Horton.
+
+ Build fixes by Ossy.
+
+ * DerivedSources.make:
+ * Shared/API/APIObject.h:
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/C/WKAPICast.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetDatabaseManager): Deleted.
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKDatabaseManager.cpp: Removed.
+ (WKDatabaseManagerGetTypeID): Deleted.
+ (WKDatabaseManagerGetOriginKey): Deleted.
+ (WKDatabaseManagerGetOriginQuotaKey): Deleted.
+ (WKDatabaseManagerGetOriginUsageKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsNameKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsDisplayNameKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsCreationTimeKey): Deleted.
+ (WKDatabaseManagerGetDatabaseDetailsModificationTimeKey): Deleted.
+ (WKDatabaseManagerSetClient): Deleted.
+ (WKDatabaseManagerGetDatabasesByOrigin): Deleted.
+ (WKDatabaseManagerGetDatabaseOrigins): Deleted.
+ (WKDatabaseManagerDeleteDatabasesWithNameForOrigin): Deleted.
+ (WKDatabaseManagerDeleteDatabasesForOrigin): Deleted.
+ (WKDatabaseManagerDeleteAllDatabases): Deleted.
+ (WKDatabaseManagerSetQuotaForOrigin): Deleted.
+ * UIProcess/API/C/WKDatabaseManager.h: Removed.
+ * UIProcess/WebDatabaseManagerProxy.cpp: Removed.
+ (WebKit::WebDatabaseManagerProxy::supplementName): Deleted.
+ (WebKit::WebDatabaseManagerProxy::originKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::originQuotaKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::originUsageKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsNameKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsDisplayNameKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsCreationTimeKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::databaseDetailsModificationTimeKey): Deleted.
+ (WebKit::WebDatabaseManagerProxy::create): Deleted.
+ (WebKit::WebDatabaseManagerProxy::WebDatabaseManagerProxy): Deleted.
+ (WebKit::WebDatabaseManagerProxy::~WebDatabaseManagerProxy): Deleted.
+ (WebKit::WebDatabaseManagerProxy::initializeClient): Deleted.
+ (WebKit::WebDatabaseManagerProxy::processPoolDestroyed): Deleted.
+ (WebKit::WebDatabaseManagerProxy::processDidClose): Deleted.
+ (WebKit::WebDatabaseManagerProxy::shouldTerminate): Deleted.
+ (WebKit::WebDatabaseManagerProxy::refWebContextSupplement): Deleted.
+ (WebKit::WebDatabaseManagerProxy::derefWebContextSupplement): Deleted.
+ (WebKit::WebDatabaseManagerProxy::getDatabasesByOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::getDatabaseOrigins): Deleted.
+ (WebKit::WebDatabaseManagerProxy::didGetDatabaseOrigins): Deleted.
+ (WebKit::WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::deleteDatabasesForOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::deleteAllDatabases): Deleted.
+ (WebKit::WebDatabaseManagerProxy::setQuotaForOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::didModifyOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxy::didModifyDatabase): Deleted.
+ * UIProcess/WebDatabaseManagerProxy.h: Removed.
+ * UIProcess/WebDatabaseManagerProxy.messages.in: Removed.
+ * UIProcess/WebDatabaseManagerProxyClient.cpp: Removed.
+ (WebKit::WebDatabaseManagerProxyClient::didModifyOrigin): Deleted.
+ (WebKit::WebDatabaseManagerProxyClient::didModifyDatabase): Deleted.
+ * UIProcess/WebDatabaseManagerProxyClient.h: Removed.
+ * UIProcess/WebProcessPool.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp: Removed.
+ (WebKit::WebDatabaseManager::supplementName): Deleted.
+ (WebKit::WebDatabaseManager::WebDatabaseManager): Deleted.
+ (WebKit::WebDatabaseManager::initialize): Deleted.
+ (WebKit::WebDatabaseManager::getDatabasesByOrigin): Deleted.
+ (WebKit::WebDatabaseManager::getDatabaseOrigins): Deleted.
+ (WebKit::WebDatabaseManager::deleteDatabaseWithNameForOrigin): Deleted.
+ (WebKit::WebDatabaseManager::deleteDatabasesForOrigin): Deleted.
+ (WebKit::WebDatabaseManager::deleteAllDatabases): Deleted.
+ (WebKit::WebDatabaseManager::closeAllDatabases): Deleted.
+ (WebKit::WebDatabaseManager::setQuotaForOrigin): Deleted.
+ (WebKit::WebDatabaseManager::dispatchDidModifyOrigin): Deleted.
+ (WebKit::WebDatabaseManager::dispatchDidModifyDatabase): Deleted.
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h: Removed.
+ * WebProcess/WebCoreSupport/WebDatabaseManager.messages.in: Removed.
+ * WebProcess/WebCoreSupport/ios/WebDatabaseManagerIOS.mm: Removed.
+ (WebKit::WebDatabaseManager::dispatchDidAddNewOrigin): Deleted.
+ (WebKit::WebDatabaseManager::dispatchDidDeleteDatabase): Deleted.
+ (WebKit::WebDatabaseManager::dispatchDidDeleteDatabaseOrigin): Deleted.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::processWillSuspendImminently):
+ (WebKit::m_webSQLiteDatabaseTracker): Deleted.
+
2015-12-18 Michael Catanzaro <[email protected]>
[GTK] Unreviewed, fix GtkDoc after r193620
Modified: trunk/Source/WebKit2/DerivedSources.make (194294 => 194295)
--- trunk/Source/WebKit2/DerivedSources.make 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/DerivedSources.make 2015-12-18 22:34:49 UTC (rev 194295)
@@ -108,8 +108,6 @@
WebConnection \
WebCookieManager \
WebCookieManagerProxy \
- WebDatabaseManager \
- WebDatabaseManagerProxy \
WebFullScreenManager \
WebFullScreenManagerProxy \
WebGeolocationManager \
Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (194294 => 194295)
--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -105,7 +105,6 @@
CacheManager,
ColorPickerResultListener,
CookieManager,
- DatabaseManager,
Download,
FormSubmissionListener,
Frame,
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (194294 => 194295)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -97,7 +97,6 @@
typedef const struct OpaqueWKContextConfiguration* WKContextConfigurationRef;
typedef const struct OpaqueWKCookieManager* WKCookieManagerRef;
typedef const struct OpaqueWKCredential* WKCredentialRef;
-typedef const struct OpaqueWKDatabaseManager* WKDatabaseManagerRef;
typedef const struct OpaqueWKDownload* WKDownloadRef;
typedef const struct OpaqueWKFormSubmissionListener* WKFormSubmissionListenerRef;
typedef const struct OpaqueWKFrameInfo* WKFrameInfoRef;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -83,7 +83,6 @@
class WebColorPickerResultListenerProxy;
class WebCookieManagerProxy;
class WebCredential;
-class WebDatabaseManagerProxy;
class WebFormSubmissionListenerProxy;
class WebFramePolicyListenerProxy;
class WebFrameProxy;
@@ -124,7 +123,6 @@
WK_ADD_API_MAPPING(WKContextConfigurationRef, API::ProcessPoolConfiguration)
WK_ADD_API_MAPPING(WKCookieManagerRef, WebCookieManagerProxy)
WK_ADD_API_MAPPING(WKCredentialRef, WebCredential)
-WK_ADD_API_MAPPING(WKDatabaseManagerRef, WebDatabaseManagerProxy)
WK_ADD_API_MAPPING(WKDownloadRef, DownloadProxy)
WK_ADD_API_MAPPING(WKFormSubmissionListenerRef, WebFormSubmissionListenerProxy)
WK_ADD_API_MAPPING(WKFramePolicyListenerRef, WebFramePolicyListenerProxy)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -46,7 +46,6 @@
// Supplements
#include "WebCookieManagerProxy.h"
-#include "WebDatabaseManagerProxy.h"
#include "WebGeolocationManagerProxy.h"
#include "WebMediaCacheManagerProxy.h"
#include "WebNotificationManagerProxy.h"
@@ -419,11 +418,6 @@
#endif
}
-WKDatabaseManagerRef WKContextGetDatabaseManager(WKContextRef contextRef)
-{
- return toAPI(toImpl(contextRef)->supplement<WebDatabaseManagerProxy>());
-}
-
WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef contextRef)
{
return toAPI(toImpl(contextRef)->supplement<WebGeolocationManagerProxy>());
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -127,7 +127,6 @@
WK_EXPORT WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context);
WK_EXPORT WKBatteryManagerRef WKContextGetBatteryManager(WKContextRef context);
WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context);
-WK_EXPORT WKDatabaseManagerRef WKContextGetDatabaseManager(WKContextRef context);
WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context);
WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);
WK_EXPORT WKKeyValueStorageManagerRef WKContextGetKeyValueStorageManager(WKContextRef context);
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2010 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 "WKDatabaseManager.h"
-
-#include "WebDatabaseManagerProxy.h"
-#include "WKAPICast.h"
-
-using namespace WebKit;
-
-WKTypeID WKDatabaseManagerGetTypeID()
-{
- return toAPI(WebDatabaseManagerProxy::APIType);
-}
-
-WKStringRef WKDatabaseManagerGetOriginKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetOriginQuotaKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetOriginUsageKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsCreationTimeKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()).leakRef();
- return toAPI(&key);
-}
-
-WKStringRef WKDatabaseManagerGetDatabaseDetailsModificationTimeKey()
-{
- static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()).leakRef();
- return toAPI(&key);
-}
-
-void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
-{
- if (wkClient && wkClient->version)
- return;
- toImpl(databaseManagerRef)->initializeClient(wkClient);
-}
-
-void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabasesByOriginFunction callback)
-{
- toImpl(databaseManagerRef)->getDatabasesByOrigin(toGenericCallbackFunction(context, callback));
-}
-
-void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction callback)
-{
- toImpl(databaseManagerRef)->getDatabaseOrigins(toGenericCallbackFunction(context, callback));
-}
-
-void WKDatabaseManagerDeleteDatabasesWithNameForOrigin(WKDatabaseManagerRef databaseManagerRef, WKStringRef databaseNameRef, WKSecurityOriginRef originRef)
-{
- toImpl(databaseManagerRef)->deleteDatabaseWithNameForOrigin(toWTFString(databaseNameRef), toImpl(originRef));
-}
-
-void WKDatabaseManagerDeleteDatabasesForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef)
-{
- toImpl(databaseManagerRef)->deleteDatabasesForOrigin(toImpl(originRef));
-}
-
-void WKDatabaseManagerDeleteAllDatabases(WKDatabaseManagerRef databaseManagerRef)
-{
- toImpl(databaseManagerRef)->deleteAllDatabases();
-}
-
-void WKDatabaseManagerSetQuotaForOrigin(WKDatabaseManagerRef databaseManagerRef, WKSecurityOriginRef originRef, uint64_t quota)
-{
- toImpl(databaseManagerRef)->setQuotaForOrigin(toImpl(originRef), quota);
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2010 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 WKDatabaseManager_h
-#define WKDatabaseManager_h
-
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Value type: WKSecurityOriginRef */
-WK_EXPORT WKStringRef WKDatabaseManagerGetOriginKey();
-
-/* Value type: WKUInt64Ref */
-WK_EXPORT WKStringRef WKDatabaseManagerGetOriginQuotaKey();
-
-/* Value type: WKUInt64Ref */
-WK_EXPORT WKStringRef WKDatabaseManagerGetOriginUsageKey();
-
-/* Value type: WKArrayRef (array of WKDictionaryRef's with keys that include:
- - WKDatabaseManagerGetDatabaseNameKey()
- - WKDatabaseManagerGetDatabaseDisplayNameKey()
- - WKDatabaseManagerGetDatabaseExpectedUsageKey()
- - WKDatabaseManagerGetDatabaseCurrentUsageKey()
- */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsKey();
-
-/* Value type: WKStringRef */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey();
-
-/* Value type: WKStringRef */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey();
-
-/* Value type: WKUInt64Ref */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey();
-
-/* Value type: WKUInt64Ref */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey();
-
-/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsCreationTimeKey();
-
-/* Value type: WKDoubleRef, seconds since January 1st, 1970 UTC */
-WK_EXPORT WKStringRef WKDatabaseManagerGetDatabaseDetailsModificationTimeKey();
-
-
-// Database Manager Client
-typedef void (*WKDatabaseManagerDidModifyOriginCallback)(WKDatabaseManagerRef databaseManager, WKSecurityOriginRef origin, const void *clientInfo);
-typedef void (*WKDatabaseManagerDidModifyDatabaseCallback)(WKDatabaseManagerRef databaseManager, WKSecurityOriginRef origin, WKStringRef databaseIdentifier, const void *clientInfo);
-
-typedef struct WKDatabaseManagerClientBase {
- int version;
- const void * clientInfo;
-} WKDatabaseManagerClientBase;
-
-typedef struct WKDatabaseManagerClientV0 {
- WKDatabaseManagerClientBase base;
-
- // Version 0.
- WKDatabaseManagerDidModifyOriginCallback didModifyOrigin;
- WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
-} WKDatabaseManagerClientV0;
-
-WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
-
-WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClientBase* client);
-
-typedef void (*WKDatabaseManagerGetDatabasesByOriginFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManager, void* context, WKDatabaseManagerGetDatabasesByOriginFunction function);
-
-typedef void (*WKDatabaseManagerGetDatabaseOriginsFunction)(WKArrayRef, WKErrorRef, void*);
-WK_EXPORT void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef contextRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction function);
-
-WK_EXPORT void WKDatabaseManagerDeleteDatabasesWithNameForOrigin(WKDatabaseManagerRef databaseManager, WKStringRef databaseName, WKSecurityOriginRef origin);
-WK_EXPORT void WKDatabaseManagerDeleteDatabasesForOrigin(WKDatabaseManagerRef databaseManager, WKSecurityOriginRef origin);
-WK_EXPORT void WKDatabaseManagerDeleteAllDatabases(WKDatabaseManagerRef databaseManager);
-
-WK_EXPORT void WKDatabaseManagerSetQuotaForOrigin(WKDatabaseManagerRef databaseManager, WKSecurityOriginRef origin, uint64_t quota);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // WKDatabaseManager_h
Deleted: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,264 +0,0 @@
-/*
- * Copyright (C) 2010, 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 "WebDatabaseManagerProxy.h"
-
-#include "APIArray.h"
-#include "APIDictionary.h"
-#include "APISecurityOrigin.h"
-#include "WebDatabaseManagerMessages.h"
-#include "WebDatabaseManagerProxyMessages.h"
-#include "WebProcessPool.h"
-#include <wtf/NeverDestroyed.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebDatabaseManagerProxy::supplementName()
-{
- return "WebDatabaseManagerProxy";
-}
-
-String WebDatabaseManagerProxy::originKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerOriginKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::originQuotaKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerOriginQuotaKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::originUsageKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerOriginUsageKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsNameKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsNameKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsDisplayNameKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsExpectedUsageKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsCurrentUsageKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsCreationTimeKey"));
- return key;
-}
-
-String WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()
-{
- static NeverDestroyed<String> key(ASCIILiteral("WebDatabaseManagerDatabaseDetailsModificationTimeKey"));
- return key;
-}
-
-PassRefPtr<WebDatabaseManagerProxy> WebDatabaseManagerProxy::create(WebProcessPool* processPool)
-{
- return adoptRef(new WebDatabaseManagerProxy(processPool));
-}
-
-WebDatabaseManagerProxy::WebDatabaseManagerProxy(WebProcessPool* processPool)
- : WebContextSupplement(processPool)
-{
- WebContextSupplement::processPool()->addMessageReceiver(Messages::WebDatabaseManagerProxy::messageReceiverName(), *this);
-}
-
-WebDatabaseManagerProxy::~WebDatabaseManagerProxy()
-{
-}
-
-void WebDatabaseManagerProxy::initializeClient(const WKDatabaseManagerClientBase* client)
-{
- m_client.initialize(client);
-}
-
-// WebContextSupplement
-
-void WebDatabaseManagerProxy::processPoolDestroyed()
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
-}
-
-void WebDatabaseManagerProxy::processDidClose(WebProcessProxy*)
-{
- invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
-}
-
-bool WebDatabaseManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
- return m_arrayCallbacks.isEmpty();
-}
-
-void WebDatabaseManagerProxy::refWebContextSupplement()
-{
- API::Object::ref();
-}
-
-void WebDatabaseManagerProxy::derefWebContextSupplement()
-{
- API::Object::deref();
-}
-
-void WebDatabaseManagerProxy::getDatabasesByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- RefPtr<ArrayCallback> callback = ArrayCallback::create(WTF::move(callbackFunction));
- uint64_t callbackID = callback->callbackID();
- m_arrayCallbacks.set(callbackID, callback.release());
-
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::GetDatabasesByOrigin(callbackID));
-}
-
-void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndDatabases>& originAndDatabasesVector, uint64_t callbackID)
-{
- RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
- if (!callback) {
- // FIXME: Log error or assert.
- return;
- }
-
- Vector<RefPtr<API::Object>> result;
- result.reserveInitialCapacity(originAndDatabasesVector.size());
-
- for (const auto& originAndDatabases : originAndDatabasesVector) {
- RefPtr<API::Object> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier));
-
- Vector<RefPtr<API::Object>> databases;
- databases.reserveInitialCapacity(originAndDatabases.databases.size());
-
- for (const auto& databaseDetails : originAndDatabases.databases) {
- HashMap<String, RefPtr<API::Object>> detailsMap;
-
- detailsMap.set(databaseDetailsNameKey(), API::String::create(databaseDetails.name()));
- detailsMap.set(databaseDetailsDisplayNameKey(), API::String::create(databaseDetails.displayName()));
- detailsMap.set(databaseDetailsExpectedUsageKey(), API::UInt64::create(databaseDetails.expectedUsage()));
- detailsMap.set(databaseDetailsCurrentUsageKey(), API::UInt64::create(databaseDetails.currentUsage()));
- if (databaseDetails.creationTime())
- detailsMap.set(databaseDetailsCreationTimeKey(), API::Double::create(databaseDetails.creationTime()));
- if (databaseDetails.modificationTime())
- detailsMap.set(databaseDetailsModificationTimeKey(), API::Double::create(databaseDetails.modificationTime()));
-
- databases.uncheckedAppend(API::Dictionary::create(WTF::move(detailsMap)));
- }
-
- HashMap<String, RefPtr<API::Object>> originAndDatabasesMap;
- originAndDatabasesMap.set(originKey(), origin);
- originAndDatabasesMap.set(originQuotaKey(), API::UInt64::create(originAndDatabases.originQuota));
- originAndDatabasesMap.set(originUsageKey(), API::UInt64::create(originAndDatabases.originUsage));
- originAndDatabasesMap.set(databaseDetailsKey(), API::Array::create(WTF::move(databases)));
-
- result.uncheckedAppend(API::Dictionary::create(WTF::move(originAndDatabasesMap)));
- }
-
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(result)).ptr());
-}
-
-void WebDatabaseManagerProxy::getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
-{
- RefPtr<ArrayCallback> callback = ArrayCallback::create(WTF::move(callbackFunction));
- uint64_t callbackID = callback->callbackID();
- m_arrayCallbacks.set(callbackID, callback.release());
-
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::GetDatabaseOrigins(callbackID));
-}
-
-void WebDatabaseManagerProxy::didGetDatabaseOrigins(const Vector<String>& originIdentifiers, uint64_t callbackID)
-{
- RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
- if (!callback) {
- // FIXME: Log error or assert.
- return;
- }
-
- Vector<RefPtr<API::Object>> securityOrigins;
- securityOrigins.reserveInitialCapacity(originIdentifiers.size());
-
- for (const auto& originIdentifier : originIdentifiers)
- securityOrigins.uncheckedAppend(API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier)));
-
- callback->performCallbackWithReturnValue(API::Array::create(WTF::move(securityOrigins)).ptr());
-}
-
-void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, API::SecurityOrigin* origin)
-{
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::DeleteDatabaseWithNameForOrigin(databaseIdentifier, origin->securityOrigin().databaseIdentifier()));
-}
-
-void WebDatabaseManagerProxy::deleteDatabasesForOrigin(API::SecurityOrigin* origin)
-{
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::DeleteDatabasesForOrigin(origin->securityOrigin().databaseIdentifier()));
-}
-
-void WebDatabaseManagerProxy::deleteAllDatabases()
-{
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::DeleteAllDatabases());
-}
-
-void WebDatabaseManagerProxy::setQuotaForOrigin(API::SecurityOrigin* origin, uint64_t quota)
-{
- processPool()->sendToOneProcess(Messages::WebDatabaseManager::SetQuotaForOrigin(origin->securityOrigin().databaseIdentifier(), quota));
-}
-
-void WebDatabaseManagerProxy::didModifyOrigin(const String& originIdentifier)
-{
- RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
- m_client.didModifyOrigin(this, origin.get());
-}
-
-void WebDatabaseManagerProxy::didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier)
-{
- RefPtr<API::SecurityOrigin> origin = API::SecurityOrigin::create(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
- m_client.didModifyDatabase(this, origin.get(), databaseIdentifier);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2010, 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 WebDatabaseManagerProxy_h
-#define WebDatabaseManagerProxy_h
-
-#include "APIObject.h"
-#include "Arguments.h"
-#include "GenericCallback.h"
-#include "MessageReceiver.h"
-#include "OriginAndDatabases.h"
-#include "WebContextSupplement.h"
-#include "WebDatabaseManagerProxyClient.h"
-#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebKit {
-
-class WebProcessPool;
-class WebProcessProxy;
-
-typedef GenericCallback<API::Array*> ArrayCallback;
-
-class WebDatabaseManagerProxy : public API::ObjectImpl<API::Object::Type::DatabaseManager>, public WebContextSupplement, private IPC::MessageReceiver {
-public:
- static const char* supplementName();
-
- static PassRefPtr<WebDatabaseManagerProxy> create(WebProcessPool*);
- virtual ~WebDatabaseManagerProxy();
-
- void initializeClient(const WKDatabaseManagerClientBase*);
-
- void getDatabasesByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
- void getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
- void deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, API::SecurityOrigin*);
- void deleteDatabasesForOrigin(API::SecurityOrigin*);
- void deleteAllDatabases();
- void setQuotaForOrigin(API::SecurityOrigin*, uint64_t quota);
-
- static String originKey();
- static String originQuotaKey();
- static String originUsageKey();
- static String databaseDetailsKey();
- static String databaseDetailsNameKey();
- static String databaseDetailsDisplayNameKey();
- static String databaseDetailsExpectedUsageKey();
- static String databaseDetailsCurrentUsageKey();
- static String databaseDetailsCreationTimeKey();
- static String databaseDetailsModificationTimeKey();
-
- using API::Object::ref;
- using API::Object::deref;
-
-private:
- explicit WebDatabaseManagerProxy(WebProcessPool*);
-
- // WebContextSupplement
- virtual void processPoolDestroyed() override;
- virtual void processDidClose(WebProcessProxy*) override;
- virtual bool shouldTerminate(WebProcessProxy*) const override;
- virtual void refWebContextSupplement() override;
- virtual void derefWebContextSupplement() override;
-
- // IPC::MessageReceiver
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
- // Message handlers.
- void didGetDatabasesByOrigin(const Vector<OriginAndDatabases>& originAndDatabases, uint64_t callbackID);
- void didGetDatabaseOrigins(const Vector<String>& originIdentifiers, uint64_t callbackID);
- void didModifyOrigin(const String& originIdentifier);
- void didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier);
-
- HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
- WebDatabaseManagerProxyClient m_client;
-};
-
-} // namespace WebKit
-
-#endif // DatabaseManagerProxy_h
Deleted: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.messages.in 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,28 +0,0 @@
-# Copyright (C) 2010 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 -> WebDatabaseManagerProxy {
- DidGetDatabasesByOrigin(Vector<WebKit::OriginAndDatabases> originAndDatabases, uint64_t callbackID);
- DidGetDatabaseOrigins(Vector<String> originIdentifiers, uint64_t callbackID)
- DidModifyOrigin(String originIdentifier)
- DidModifyDatabase(String originIdentifier, String databaseIdentifier)
-}
Deleted: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 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 "WebDatabaseManagerProxyClient.h"
-
-#include "WKAPICast.h"
-#include "WebDatabaseManagerProxy.h"
-
-namespace WebKit {
-
-void WebDatabaseManagerProxyClient::didModifyOrigin(WebDatabaseManagerProxy* databaseManager, API::SecurityOrigin* origin)
-{
- if (!m_client.didModifyOrigin)
- return;
-
- m_client.didModifyOrigin(toAPI(databaseManager), toAPI(origin), m_client.base.clientInfo);
-}
-
-void WebDatabaseManagerProxyClient::didModifyDatabase(WebDatabaseManagerProxy* databaseManager, API::SecurityOrigin* origin, const String& databaseIdentifier)
-{
- if (!m_client.didModifyDatabase)
- return;
-
- m_client.didModifyDatabase(toAPI(databaseManager), toAPI(origin), toAPI(databaseIdentifier.impl()), m_client.base.clientInfo);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2010 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 WebDatabaseManagerProxyClient_h
-#define WebDatabaseManagerProxyClient_h
-
-#include "APIClient.h"
-#include "WKDatabaseManager.h"
-#include <wtf/Forward.h>
-
-namespace API {
-template<> struct ClientTraits<WKDatabaseManagerClientBase> {
- typedef std::tuple<WKDatabaseManagerClientV0> Versions;
-};
-
-class SecurityOrigin;
-}
-
-namespace WebKit {
-
-class WebDatabaseManagerProxy;
-
-class WebDatabaseManagerProxyClient : public API::Client<WKDatabaseManagerClientBase> {
-public:
- void didModifyOrigin(WebDatabaseManagerProxy*, API::SecurityOrigin*);
- void didModifyDatabase(WebDatabaseManagerProxy*, API::SecurityOrigin*, const String& databaseIdentifier);
-};
-
-} // namespace WebKit
-
-#endif // WebDatabaseManagerProxyClient_h
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (194294 => 194295)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -46,7 +46,6 @@
#include "WebContextSupplement.h"
#include "WebCookieManagerProxy.h"
#include "WebCoreArgumentCoders.h"
-#include "WebDatabaseManagerProxy.h"
#include "WebGeolocationManagerProxy.h"
#include "WebIconDatabase.h"
#include "WebKit2Initialize.h"
@@ -176,7 +175,6 @@
addSupplement<WebGeolocationManagerProxy>();
addSupplement<WebMediaCacheManagerProxy>();
addSupplement<WebNotificationManagerProxy>();
- addSupplement<WebDatabaseManagerProxy>();
#if USE(SOUP)
addSupplement<WebSoupCustomProtocolRequestManager>();
#endif
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194294 => 194295)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-18 22:34:49 UTC (rev 194295)
@@ -598,7 +598,6 @@
2D28A4971AF965A100F190C9 /* WKViewLayoutStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */; };
2D28A4981AF965A200F190C9 /* WKViewLayoutStrategy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */; };
2D28F3E41885CCC1004B9EAE /* WebChromeClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */; };
- 2D28F3E51885CCC1004B9EAE /* WebDatabaseManagerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E11885CCC1004B9EAE /* WebDatabaseManagerIOS.mm */; };
2D28F3E61885CCC1004B9EAE /* WebEditorClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E21885CCC1004B9EAE /* WebEditorClientIOS.mm */; };
2D28F3E71885CCC1004B9EAE /* WebFrameLoaderClientIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D28F3E31885CCC1004B9EAE /* WebFrameLoaderClientIOS.mm */; };
2D29ECD0192F2C2E00984B78 /* RemoteLayerTreeDisplayRefreshMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D29ECCE192F2C2E00984B78 /* RemoteLayerTreeDisplayRefreshMonitor.h */; };
@@ -1560,8 +1559,6 @@
BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */; };
- BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */; };
- BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */; };
BCAE9E08160C1C0700A33217 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
@@ -1831,18 +1828,8 @@
F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */; };
F6113E28126CE19B0057D0A7 /* WKUserContentURLPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */; };
F6113E29126CE19B0057D0A7 /* WKUserContentURLPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */; settings = {ATTRIBUTES = (Private, ); }; };
- F62A765C12B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A765912B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp */; };
- F62A765D12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A765A12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h */; };
- F62A766112B1ABED0005F1B6 /* WKDatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A765F12B1ABED0005F1B6 /* WKDatabaseManager.cpp */; };
- F62A766212B1ABED0005F1B6 /* WKDatabaseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A766012B1ABED0005F1B6 /* WKDatabaseManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
- F62A76B612B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A76B212B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp */; };
- F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B312B1B25F0005F1B6 /* WebDatabaseManagerMessages.h */; };
- F62A76B812B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */; };
- F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */; };
F634445612A885C8000612D8 /* APISecurityOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = F634445512A885C8000612D8 /* APISecurityOrigin.h */; };
F67DD7BA125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
- F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6A25FDA12ADC6CC00DC40CC /* WebDatabaseManager.cpp */; };
- F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A25FDB12ADC6CC00DC40CC /* WebDatabaseManager.h */; };
F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */; };
F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */; };
FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */; };
@@ -2748,7 +2735,6 @@
2D28A4951AF965A100F190C9 /* WKViewLayoutStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewLayoutStrategy.h; sourceTree = "<group>"; };
2D28A4961AF965A100F190C9 /* WKViewLayoutStrategy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKViewLayoutStrategy.mm; sourceTree = "<group>"; };
2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebChromeClientIOS.mm; path = ios/WebChromeClientIOS.mm; sourceTree = "<group>"; };
- 2D28F3E11885CCC1004B9EAE /* WebDatabaseManagerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebDatabaseManagerIOS.mm; path = ios/WebDatabaseManagerIOS.mm; sourceTree = "<group>"; };
2D28F3E21885CCC1004B9EAE /* WebEditorClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebEditorClientIOS.mm; path = ios/WebEditorClientIOS.mm; sourceTree = "<group>"; };
2D28F3E31885CCC1004B9EAE /* WebFrameLoaderClientIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebFrameLoaderClientIOS.mm; path = ios/WebFrameLoaderClientIOS.mm; sourceTree = "<group>"; };
2D29ECCE192F2C2E00984B78 /* RemoteLayerTreeDisplayRefreshMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDisplayRefreshMonitor.h; sourceTree = "<group>"; };
@@ -3792,8 +3778,6 @@
BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageLoaderClient.h; sourceTree = "<group>"; };
BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageUIClient.cpp; sourceTree = "<group>"; };
BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageUIClient.h; sourceTree = "<group>"; };
- BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyClient.h; sourceTree = "<group>"; };
- BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyClient.cpp; sourceTree = "<group>"; };
BCACC40D16B0B7BE00B6E092 /* BaseXPCService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseXPCService.xcconfig; sourceTree = "<group>"; };
BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.xcconfig; sourceTree = "<group>"; };
BCACC40F16B0B8A800B6E092 /* WebContentService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebContentService.Development.xcconfig; sourceTree = "<group>"; };
@@ -4086,22 +4070,10 @@
F6113E24126CE1820057D0A7 /* APIUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserContentURLPattern.h; sourceTree = "<group>"; };
F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
- F62A765712B1AB7D0005F1B6 /* WebDatabaseManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebDatabaseManager.messages.in; sourceTree = "<group>"; };
- F62A765912B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxy.cpp; sourceTree = "<group>"; };
- F62A765A12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxy.h; sourceTree = "<group>"; };
- F62A765B12B1ABC30005F1B6 /* WebDatabaseManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebDatabaseManagerProxy.messages.in; sourceTree = "<group>"; };
- F62A765F12B1ABED0005F1B6 /* WKDatabaseManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDatabaseManager.cpp; sourceTree = "<group>"; };
- F62A766012B1ABED0005F1B6 /* WKDatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDatabaseManager.h; sourceTree = "<group>"; };
- F62A76B212B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerMessageReceiver.cpp; sourceTree = "<group>"; };
- F62A76B312B1B25F0005F1B6 /* WebDatabaseManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerMessages.h; sourceTree = "<group>"; };
- F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
- F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerProxyMessages.h; sourceTree = "<group>"; };
F634445512A885C8000612D8 /* APISecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISecurityOrigin.h; sourceTree = "<group>"; };
F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPCookieAcceptPolicy.h; sourceTree = "<group>"; };
F67DD7B9125E40D9007BDCB8 /* WKSerializedScriptValuePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSerializedScriptValuePrivate.h; sourceTree = "<group>"; };
F6A0C13F13281E6E0070430F /* ResourceCachesToClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCachesToClear.h; sourceTree = "<group>"; };
- F6A25FDA12ADC6CC00DC40CC /* WebDatabaseManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDatabaseManager.cpp; sourceTree = "<group>"; };
- F6A25FDB12ADC6CC00DC40CC /* WebDatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManager.h; sourceTree = "<group>"; };
F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerMac.mm; sourceTree = "<group>"; };
F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerProxyMac.mm; sourceTree = "<group>"; };
FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APISerializedScriptValueCocoa.mm; sourceTree = "<group>"; };
@@ -5091,7 +5063,6 @@
isa = PBXGroup;
children = (
2D28F3E01885CCC1004B9EAE /* WebChromeClientIOS.mm */,
- 2D28F3E11885CCC1004B9EAE /* WebDatabaseManagerIOS.mm */,
2D28F3E21885CCC1004B9EAE /* WebEditorClientIOS.mm */,
2D28F3E31885CCC1004B9EAE /* WebFrameLoaderClientIOS.mm */,
A1C512C6190656E500448914 /* WebQuickLookHandleClient.cpp */,
@@ -6055,9 +6026,6 @@
3F87B9BB15893F630090FF62 /* WebColorChooser.h */,
BC111A54112F4FBB00337BAB /* WebContextMenuClient.cpp */,
BC032D6210F4378D0058C15A /* WebContextMenuClient.h */,
- F6A25FDA12ADC6CC00DC40CC /* WebDatabaseManager.cpp */,
- F6A25FDB12ADC6CC00DC40CC /* WebDatabaseManager.h */,
- F62A765712B1AB7D0005F1B6 /* WebDatabaseManager.messages.in */,
CD19A2691A13E820008D650E /* WebDiagnosticLoggingClient.cpp */,
CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */,
BC111A56112F4FBB00337BAB /* WebDragClient.cpp */,
@@ -6222,11 +6190,6 @@
330934541315B9750097A7BC /* WebCookieManagerProxy.messages.in */,
33AA1064131F060000D4A575 /* WebCookieManagerProxyClient.cpp */,
33AA1065131F060000D4A575 /* WebCookieManagerProxyClient.h */,
- F62A765912B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp */,
- F62A765A12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h */,
- F62A765B12B1ABC30005F1B6 /* WebDatabaseManagerProxy.messages.in */,
- BCAC111E12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp */,
- BCAC111D12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h */,
BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */,
BCA0EF9D12332642007D3CFB /* WebEditCommandProxy.h */,
BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */,
@@ -6383,8 +6346,6 @@
512F58F112A88A5400629530 /* WKCredential.cpp */,
512F58F212A88A5400629530 /* WKCredential.h */,
518ACF1012B015F800B04B83 /* WKCredentialTypes.h */,
- F62A765F12B1ABED0005F1B6 /* WKDatabaseManager.cpp */,
- F62A766012B1ABED0005F1B6 /* WKDatabaseManager.h */,
1AB7D78C1288CD9A00CFD08C /* WKDownload.cpp */,
1AB7D78B1288CD9A00CFD08C /* WKDownload.h */,
BCE469571214EDF4000B98EB /* WKFormSubmissionListener.cpp */,
@@ -7320,10 +7281,6 @@
330934441315B9220097A7BC /* WebCookieManagerMessages.h */,
330934451315B9220097A7BC /* WebCookieManagerProxyMessageReceiver.cpp */,
330934461315B9220097A7BC /* WebCookieManagerProxyMessages.h */,
- F62A76B212B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp */,
- F62A76B312B1B25F0005F1B6 /* WebDatabaseManagerMessages.h */,
- F62A76B412B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp */,
- F62A76B512B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h */,
CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */,
CD73BA49131ACD8E00EEDED2 /* WebFullScreenManagerMessages.h */,
CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */,
@@ -8037,11 +7994,6 @@
BC1DD7B2114DC396005ADAF3 /* WebCoreArgumentCoders.h in Headers */,
512F589B12A8838800629530 /* WebCredential.h in Headers */,
516311871858446600534647 /* WebCrossThreadCopier.h in Headers */,
- F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */,
- F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */,
- F62A765D12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h in Headers */,
- BCAC111F12C92C1F00B08EEE /* WebDatabaseManagerProxyClient.h in Headers */,
- F62A76B912B1B25F0005F1B6 /* WebDatabaseManagerProxyMessages.h in Headers */,
1AA83F6D1A5B63FF00026EC6 /* WebDatabaseProvider.h in Headers */,
CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */,
1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */,
@@ -8267,7 +8219,6 @@
512F58FA12A88A5400629530 /* WKCredential.h in Headers */,
518ACF1112B015F800B04B83 /* WKCredentialTypes.h in Headers */,
BC4075F8124FF0270068F20A /* WKData.h in Headers */,
- F62A766212B1ABED0005F1B6 /* WKDatabaseManager.h in Headers */,
377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */,
8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */,
BC4075FA124FF0270068F20A /* WKDictionary.h in Headers */,
@@ -9829,12 +9780,6 @@
BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */,
512F589A12A8838800629530 /* WebCredential.cpp in Sources */,
51BA24461858F55D00EA2811 /* WebCrossThreadCopier.cpp in Sources */,
- F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */,
- 2D28F3E51885CCC1004B9EAE /* WebDatabaseManagerIOS.mm in Sources */,
- F62A76B612B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp in Sources */,
- F62A765C12B1ABC30005F1B6 /* WebDatabaseManagerProxy.cpp in Sources */,
- BCAC112012C92C1F00B08EEE /* WebDatabaseManagerProxyClient.cpp in Sources */,
- F62A76B812B1B25F0005F1B6 /* WebDatabaseManagerProxyMessageReceiver.cpp in Sources */,
1AA83F6C1A5B63FF00026EC6 /* WebDatabaseProvider.cpp in Sources */,
CD19A26D1A13E82A008D650E /* WebDiagnosticLoggingClient.cpp in Sources */,
1A5B1C5418987EDF004FCF9B /* WebDocumentLoader.cpp in Sources */,
@@ -10052,7 +9997,6 @@
3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */,
512F58F912A88A5400629530 /* WKCredential.cpp in Sources */,
BC4075F7124FF0270068F20A /* WKData.cpp in Sources */,
- F62A766112B1ABED0005F1B6 /* WKDatabaseManager.cpp in Sources */,
1AFF49001833DE78009AB15A /* WKDeprecatedFunctions.cpp in Sources */,
BC4075F9124FF0270068F20A /* WKDictionary.cpp in Sources */,
BC017D0816260FF4007054F5 /* WKDOMDocument.mm in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -38,7 +38,6 @@
#include "WebConnectionToUIProcess.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
-#include "WebDatabaseManager.h"
#include "WebFrame.h"
#include "WebFrameNetworkingContext.h"
#include "WebPage.h"
Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2010, 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 "WebDatabaseManager.h"
-
-#include "OriginAndDatabases.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebDatabaseManagerMessages.h"
-#include "WebDatabaseManagerProxyMessages.h"
-#include "WebProcess.h"
-#include "WebProcessCreationParameters.h"
-#include <WebCore/DatabaseDetails.h>
-#include <WebCore/DatabaseManager.h>
-#include <WebCore/SecurityOrigin.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebDatabaseManager::supplementName()
-{
- return "WebDatabaseManager";
-}
-
-WebDatabaseManager::WebDatabaseManager(WebProcess* process)
- : m_process(process)
-{
- m_process->addMessageReceiver(Messages::WebDatabaseManager::messageReceiverName(), *this);
-}
-
-void WebDatabaseManager::initialize(const WebProcessCreationParameters& parameters)
-{
- auto& databaseManager = DatabaseManager::singleton();
- databaseManager.initialize(parameters.webSQLDatabaseDirectory);
- databaseManager.setClient(this);
-}
-
-void WebDatabaseManager::getDatabasesByOrigin(uint64_t callbackID) const
-{
- // FIXME: This could be made more efficient by adding a function to DatabaseManager
- // to get both the origins and the Vector of DatabaseDetails for each origin in one
- // shot. That would avoid taking the numerous locks this requires.
-
- auto& databaseManager = DatabaseManager::singleton();
- Vector<RefPtr<SecurityOrigin>> origins;
- databaseManager.origins(origins);
-
- Vector<OriginAndDatabases> originAndDatabasesVector;
- originAndDatabasesVector.reserveInitialCapacity(origins.size());
-
- for (size_t i = 0; i < origins.size(); ++i) {
- OriginAndDatabases originAndDatabases;
-
- Vector<String> nameVector;
- if (!databaseManager.databaseNamesForOrigin(origins[i].get(), nameVector))
- continue;
-
- Vector<DatabaseDetails> detailsVector;
- detailsVector.reserveInitialCapacity(nameVector.size());
- for (size_t j = 0; j < nameVector.size(); j++) {
- DatabaseDetails details = databaseManager.detailsForNameAndOrigin(nameVector[j], origins[i].get());
- if (details.name().isNull())
- continue;
-
- detailsVector.append(details);
- }
-
- if (detailsVector.isEmpty())
- continue;
-
- originAndDatabases.originIdentifier = origins[i]->databaseIdentifier();
- originAndDatabases.originQuota = databaseManager.quotaForOrigin(origins[i].get());
- originAndDatabases.originUsage = databaseManager.usageForOrigin(origins[i].get());
- originAndDatabases.databases.swap(detailsVector);
- originAndDatabasesVector.append(originAndDatabases);
- }
-
- m_process->send(Messages::WebDatabaseManagerProxy::DidGetDatabasesByOrigin(originAndDatabasesVector, callbackID), 0);
-}
-
-void WebDatabaseManager::getDatabaseOrigins(uint64_t callbackID) const
-{
- Vector<RefPtr<SecurityOrigin>> origins;
- DatabaseManager::singleton().origins(origins);
-
- size_t numOrigins = origins.size();
-
- Vector<String> identifiers(numOrigins);
- for (size_t i = 0; i < numOrigins; ++i)
- identifiers[i] = origins[i]->databaseIdentifier();
- m_process->send(Messages::WebDatabaseManagerProxy::DidGetDatabaseOrigins(identifiers, callbackID), 0);
-}
-
-void WebDatabaseManager::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const
-{
- DatabaseManager::singleton().deleteDatabase(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), databaseIdentifier);
-}
-
-void WebDatabaseManager::deleteDatabasesForOrigin(const String& originIdentifier) const
-{
- DatabaseManager::singleton().deleteOrigin(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr());
-}
-
-void WebDatabaseManager::deleteAllDatabases() const
-{
- DatabaseManager::singleton().deleteAllDatabases();
-}
-
-void WebDatabaseManager::closeAllDatabases() const
-{
- DatabaseManager::singleton().closeAllDatabases();
-}
-
-void WebDatabaseManager::setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const
-{
- // If the quota is set to a value lower than the current usage, that quota will
- // "stick" but no data will be purged to meet the new quota. This will simply
- // prevent new data from being added to databases in that origin.
- DatabaseManager::singleton().setQuota(SecurityOrigin::createFromDatabaseIdentifier(originIdentifier).ptr(), quota);
-}
-
-void WebDatabaseManager::dispatchDidModifyOrigin(SecurityOrigin* origin)
-{
- // NOTE: This may be called on a non-main thread.
- m_process->send(Messages::WebDatabaseManagerProxy::DidModifyOrigin(origin->databaseIdentifier()), 0);
-}
-
-void WebDatabaseManager::dispatchDidModifyDatabase(WebCore::SecurityOrigin* origin, const String& databaseIdentifier)
-{
- // NOTE: This may be called on a non-main thread.
- m_process->send(Messages::WebDatabaseManagerProxy::DidModifyDatabase(origin->databaseIdentifier(), databaseIdentifier), 0);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2010, 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 WebDatabaseManager_h
-#define WebDatabaseManager_h
-
-#include "MessageReceiver.h"
-#include "WebProcessSupplement.h"
-#include <WebCore/DatabaseManagerClient.h>
-#include <stdint.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebKit {
-
-class WebProcess;
-
-class WebDatabaseManager : public WebCore::DatabaseManagerClient, public WebProcessSupplement, public IPC::MessageReceiver {
- WTF_MAKE_NONCOPYABLE(WebDatabaseManager);
-public:
- explicit WebDatabaseManager(WebProcess*);
-
- static const char* supplementName();
-
- void setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const;
- void deleteAllDatabases() const;
-
- void closeAllDatabases() const;
-
-private:
- // WebProcessSupplement
- virtual void initialize(const WebProcessCreationParameters&) override;
-
- // IPC::MessageReceiver
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
- void getDatabasesByOrigin(uint64_t callbackID) const;
- void getDatabaseOrigins(uint64_t callbackID) const;
- void deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, const String& originIdentifier) const;
- void deleteDatabasesForOrigin(const String& originIdentifier) const;
-
- // WebCore::DatabaseManagerClient
- virtual void dispatchDidModifyOrigin(WebCore::SecurityOrigin*) override;
- virtual void dispatchDidModifyDatabase(WebCore::SecurityOrigin*, const String& databaseIdentifier) override;
-
-#if PLATFORM(IOS)
- virtual void dispatchDidAddNewOrigin(WebCore::SecurityOrigin*) override;
- virtual void dispatchDidDeleteDatabase() override;
- virtual void dispatchDidDeleteDatabaseOrigin() override;
-#endif
-
- WebProcess* m_process;
-};
-
-} // namespace WebKit
-
-#endif // WebDatabaseManager_h
Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.messages.in 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,30 +0,0 @@
-# Copyright (C) 2010 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 -> WebDatabaseManager {
- void GetDatabasesByOrigin(uint64_t callbackID)
- void GetDatabaseOrigins(uint64_t callbackID)
- void DeleteDatabaseWithNameForOrigin(String databaseIdentifier, String originIdentifier)
- void DeleteDatabasesForOrigin(String originIdentifier)
- void DeleteAllDatabases()
- void SetQuotaForOrigin(String originIdentifier, uint64_t quota)
-}
Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebDatabaseManagerIOS.mm (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebDatabaseManagerIOS.mm 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebDatabaseManagerIOS.mm 2015-12-18 22:34:49 UTC (rev 194295)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-#import "config.h"
-#import "WebDatabaseManager.h"
-
-#if PLATFORM(IOS)
-
-#import <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-void WebDatabaseManager::dispatchDidAddNewOrigin(WebCore::SecurityOrigin*)
-{
- notImplemented();
-}
-
-void WebDatabaseManager::dispatchDidDeleteDatabase()
-{
- notImplemented();
-}
-
-void WebDatabaseManager::dispatchDidDeleteDatabaseOrigin()
-{
- notImplemented();
-}
-
-} // namespace WebKit
-
-#endif // PLATFORM(IOS)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (194294 => 194295)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-12-18 22:03:30 UTC (rev 194294)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-12-18 22:34:49 UTC (rev 194295)
@@ -44,7 +44,6 @@
#include "WebConnectionToUIProcess.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
-#include "WebDatabaseManager.h"
#include "WebFrame.h"
#include "WebFrameNetworkingContext.h"
#include "WebGeolocationManager.h"
@@ -70,6 +69,8 @@
#include <WebCore/AuthenticationChallenge.h>
#include <WebCore/CrossOriginPreflightResultCache.h>
#include <WebCore/DNS.h>
+#include <WebCore/DatabaseManager.h>
+#include <WebCore/DatabaseTracker.h>
#include <WebCore/FontCache.h>
#include <WebCore/FontCascade.h>
#include <WebCore/Frame.h>
@@ -180,7 +181,6 @@
addSupplement<WebCookieManager>();
addSupplement<WebMediaCacheManager>();
addSupplement<AuthenticationManager>();
- addSupplement<WebDatabaseManager>();
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
addSupplement<WebNotificationManager>();
@@ -262,6 +262,9 @@
for (auto& supplement : m_supplements.values())
supplement->initialize(parameters);
+ auto& databaseManager = DatabaseManager::singleton();
+ databaseManager.initialize(parameters.webSQLDatabaseDirectory);
+
#if ENABLE(ICONDATABASE)
m_iconDatabaseProxy.setEnabled(parameters.iconDatabaseEnabled);
#endif
@@ -1187,7 +1190,7 @@
return;
}
- supplement<WebDatabaseManager>()->closeAllDatabases();
+ DatabaseTracker::tracker().closeAllDatabases();
actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
handled = true;
}
