Remove dead local storage code
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 May 2013 23:06:08 +0000 (23:06 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 May 2013 23:06:08 +0000 (23:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=116360

Reviewed by Beth Dakin.

Storage is all handled in the UI process now so we no longer need a WebKeyValueStorageManager in the web process.

* DerivedSources.make:
* UIProcess/WebKeyValueStorageManagerProxy.cpp:
(WebKit::WebKeyValueStorageManagerProxy::WebKeyValueStorageManagerProxy):
(WebKit):
(WebKit::didGetKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManagerProxy::getKeyValueStorageOrigins):
* UIProcess/WebKeyValueStorageManagerProxy.h:
(WebKeyValueStorageManagerProxy):
* UIProcess/WebKeyValueStorageManagerProxy.messages.in: Removed.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/Storage/WebKeyValueStorageManager.cpp: Removed.
* WebProcess/Storage/WebKeyValueStorageManager.h: Removed.
* WebProcess/Storage/WebKeyValueStorageManager.messages.in: Removed.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make
Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp
Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h
Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.messages.in [deleted file]
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp [deleted file]
Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h [deleted file]
Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in [deleted file]
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebProcess.cpp

index e8b7b2c..8ccbdd7 100644 (file)
@@ -1,5 +1,32 @@
 2013-05-17  Anders Carlsson  <andersca@apple.com>
 
+        Remove dead local storage code
+        https://bugs.webkit.org/show_bug.cgi?id=116360
+
+        Reviewed by Beth Dakin.
+
+        Storage is all handled in the UI process now so we no longer need a WebKeyValueStorageManager in the web process.
+
+        * DerivedSources.make:
+        * UIProcess/WebKeyValueStorageManagerProxy.cpp:
+        (WebKit::WebKeyValueStorageManagerProxy::WebKeyValueStorageManagerProxy):
+        (WebKit):
+        (WebKit::didGetKeyValueStorageOrigins):
+        (WebKit::WebKeyValueStorageManagerProxy::getKeyValueStorageOrigins):
+        * UIProcess/WebKeyValueStorageManagerProxy.h:
+        (WebKeyValueStorageManagerProxy):
+        * UIProcess/WebKeyValueStorageManagerProxy.messages.in: Removed.
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/Storage/WebKeyValueStorageManager.cpp: Removed.
+        * WebProcess/Storage/WebKeyValueStorageManager.h: Removed.
+        * WebProcess/Storage/WebKeyValueStorageManager.messages.in: Removed.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+
+2013-05-17  Anders Carlsson  <andersca@apple.com>
+
         Use the UI process storage manager for deleting local storage data
         https://bugs.webkit.org/show_bug.cgi?id=116358
         <rdar://problem/13852829>
index 5dd8ab2..d284fb3 100644 (file)
@@ -102,8 +102,6 @@ MESSAGE_RECEIVERS = \
     WebIconDatabaseProxy \
     WebInspector \
     WebInspectorProxy \
-    WebKeyValueStorageManager \
-    WebKeyValueStorageManagerProxy \
     WebMediaCacheManager \
     WebMediaCacheManagerProxy \
     WebNotificationManagerProxy \
index d82fa01..ade9235 100644 (file)
@@ -28,8 +28,6 @@
 
 #include "SecurityOriginData.h"
 #include "WebContext.h"
-#include "WebKeyValueStorageManagerMessages.h"
-#include "WebKeyValueStorageManagerProxyMessages.h"
 #include "WebSecurityOrigin.h"
 
 using namespace WebCore;
@@ -49,7 +47,6 @@ PassRefPtr<WebKeyValueStorageManagerProxy> WebKeyValueStorageManagerProxy::creat
 WebKeyValueStorageManagerProxy::WebKeyValueStorageManagerProxy(WebContext* context)
     : WebContextSupplement(context)
 {
-    WebContextSupplement::context()->addMessageReceiver(Messages::WebKeyValueStorageManagerProxy::messageReceiverName(), this);
 }
 
 WebKeyValueStorageManagerProxy::~WebKeyValueStorageManagerProxy()
@@ -58,21 +55,6 @@ WebKeyValueStorageManagerProxy::~WebKeyValueStorageManagerProxy()
 
 // WebContextSupplement
 
-void WebKeyValueStorageManagerProxy::contextDestroyed()
-{
-    invalidateCallbackMap(m_arrayCallbacks);
-}
-
-void WebKeyValueStorageManagerProxy::processDidClose(WebProcessProxy*)
-{
-    invalidateCallbackMap(m_arrayCallbacks);
-}
-
-bool WebKeyValueStorageManagerProxy::shouldTerminate(WebProcessProxy*) const
-{
-    return m_arrayCallbacks.isEmpty();
-}
-
 void WebKeyValueStorageManagerProxy::refWebContextSupplement()
 {
     APIObject::ref();
@@ -83,7 +65,7 @@ void WebKeyValueStorageManagerProxy::derefWebContextSupplement()
     APIObject::deref();
 }
 
-static void didGetKeyValueStorageOriginsCallback(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)
+static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)
 {
     RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
 
@@ -98,15 +80,9 @@ static void didGetKeyValueStorageOriginsCallback(const Vector<RefPtr<WebCore::Se
 
 void WebKeyValueStorageManagerProxy::getKeyValueStorageOrigins(PassRefPtr<ArrayCallback> prpCallback)
 {
-    context()->storageManager().getOrigins(RunLoop::main(), prpCallback.leakRef(), didGetKeyValueStorageOriginsCallback);
+    context()->storageManager().getOrigins(RunLoop::main(), prpCallback.leakRef(), didGetKeyValueStorageOrigins);
 }
     
-void WebKeyValueStorageManagerProxy::didGetKeyValueStorageOrigins(const Vector<SecurityOriginData>& originDatas, uint64_t callbackID)
-{
-    RefPtr<ArrayCallback> callback = m_arrayCallbacks.take(callbackID);
-    performAPICallbackWithSecurityOriginDataVector(originDatas, callback.get());
-}
-
 void WebKeyValueStorageManagerProxy::deleteEntriesForOrigin(WebSecurityOrigin* origin)
 {
     context()->storageManager().deleteEntriesForOrigin(origin->securityOrigin());
index 1223edb..ee84533 100644 (file)
 
 namespace WebKit {
 
-struct SecurityOriginData;
-class WebContext;
-class WebProcessProxy;
-class WebSecurityOrigin;
-
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebKeyValueStorageManagerProxy : public TypedAPIObject<APIObject::TypeKeyValueStorageManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebKeyValueStorageManagerProxy : public TypedAPIObject<APIObject::TypeKeyValueStorageManager>, public WebContextSupplement {
 public:
     static const char* supplementName();
 
@@ -61,19 +56,9 @@ public:
 private:
     explicit WebKeyValueStorageManagerProxy(WebContext*);
 
-    void didGetKeyValueStorageOrigins(const Vector<SecurityOriginData>&, uint64_t callbackID);
-
     // WebContextSupplement
-    virtual void contextDestroyed() OVERRIDE;
-    virtual void processDidClose(WebProcessProxy*) OVERRIDE;
-    virtual bool shouldTerminate(WebProcessProxy*) const OVERRIDE;
     virtual void refWebContextSupplement() OVERRIDE;
     virtual void derefWebContextSupplement() OVERRIDE;
-
-    // CoreIPC::MessageReceiver
-    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
-
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.messages.in b/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.messages.in
deleted file mode 100644 (file)
index b76389a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2011 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 -> WebKeyValueStorageManagerProxy {
-    DidGetKeyValueStorageOrigins(Vector<WebKit::SecurityOriginData> originIdentifiers, uint64_t callbackID);
-}
index 37c4459..16059cc 100644 (file)
                1AA5889311EE70400061B882 /* NetscapePluginStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA5889111EE70400061B882 /* NetscapePluginStream.cpp */; };
                1AAB4A8D1296F0A20023952F /* SandboxExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */; };
                1AAB4AAA1296F1540023952F /* SandboxExtensionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */; };
-               1AAC4DE616B1CBF6009425E3 /* WebKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */; };
-               1AAC4DE716B1CBF6009425E3 /* WebKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */; };
                1AAF061412B01131008E49E2 /* PDFViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF061212B01131008E49E2 /* PDFViewController.h */; };
                1AAF061512B01131008E49E2 /* PDFViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF061312B01131008E49E2 /* PDFViewController.mm */; };
                1AAF0C4A12B16334008E49E2 /* ArgumentCodersCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF0C4812B16334008E49E2 /* ArgumentCodersCF.h */; };
                51A9E1061315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1031315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h */; };
                51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */; };
                51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51A9E1281315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1241315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp */; };
-               51A9E1291315ED35009E7031 /* WebKeyValueStorageManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1251315ED35009E7031 /* WebKeyValueStorageManagerMessages.h */; };
-               51A9E12A1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1261315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp */; };
-               51A9E12B1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1271315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h */; };
                51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */; };
                51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACBB9E127A8F2C00D203B9 /* WebContextMenuProxyMac.h */; };
                51ACBBA1127A8F2C00D203B9 /* WebContextMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51ACBB9F127A8F2C00D203B9 /* WebContextMenuProxyMac.mm */; };
                1AA5889111EE70400061B882 /* NetscapePluginStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginStream.cpp; sourceTree = "<group>"; };
                1AAB4A8C1296F0A20023952F /* SandboxExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxExtension.h; sourceTree = "<group>"; };
                1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxExtensionMac.mm; sourceTree = "<group>"; };
-               1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyValueStorageManager.cpp; sourceTree = "<group>"; };
-               1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyValueStorageManager.h; sourceTree = "<group>"; };
-               1AAC4DE316B1CBF6009425E3 /* WebKeyValueStorageManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKeyValueStorageManager.messages.in; sourceTree = "<group>"; };
                1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
                1AAF061212B01131008E49E2 /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFViewController.h; sourceTree = "<group>"; };
                1AAF061312B01131008E49E2 /* PDFViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PDFViewController.mm; sourceTree = "<group>"; };
                51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkProcess.messages.in; path = NetworkProcess/NetworkProcess.messages.in; sourceTree = "<group>"; };
                51A9E1021315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyValueStorageManagerProxy.cpp; sourceTree = "<group>"; };
                51A9E1031315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyValueStorageManagerProxy.h; sourceTree = "<group>"; };
-               51A9E1041315CCFC009E7031 /* WebKeyValueStorageManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKeyValueStorageManagerProxy.messages.in; sourceTree = "<group>"; };
                51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKKeyValueStorageManager.cpp; sourceTree = "<group>"; };
                51A9E1091315CD18009E7031 /* WKKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKKeyValueStorageManager.h; sourceTree = "<group>"; };
-               51A9E1241315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyValueStorageManagerMessageReceiver.cpp; sourceTree = "<group>"; };
-               51A9E1251315ED35009E7031 /* WebKeyValueStorageManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyValueStorageManagerMessages.h; sourceTree = "<group>"; };
-               51A9E1261315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKeyValueStorageManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
-               51A9E1271315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKeyValueStorageManagerProxyMessages.h; sourceTree = "<group>"; };
                51ABF65616392F1500132A7A /* WebResourceLoadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebResourceLoadScheduler.cpp; path = Network/WebResourceLoadScheduler.cpp; sourceTree = "<group>"; };
                51ABF65716392F1500132A7A /* WebResourceLoadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebResourceLoadScheduler.h; path = Network/WebResourceLoadScheduler.h; sourceTree = "<group>"; };
                51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextMenuProxy.h; sourceTree = "<group>"; };
                                1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */,
                                1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */,
                                1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */,
-                               1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
-                               1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */,
-                               1AAC4DE316B1CBF6009425E3 /* WebKeyValueStorageManager.messages.in */,
                        );
                        path = Storage;
                        sourceTree = "<group>";
                                1C77C1951288A872006A742F /* WebInspectorProxy.messages.in */,
                                51A9E1021315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp */,
                                51A9E1031315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h */,
-                               51A9E1041315CCFC009E7031 /* WebKeyValueStorageManagerProxy.messages.in */,
                                BCB9E76111232B9E00A137E0 /* WebLoaderClient.cpp */,
                                BC59534010FC04520098F82D /* WebLoaderClient.h */,
                                33D3A3B71339606200709BE4 /* WebMediaCacheManagerProxy.cpp */,
                                1C8E2A321277852400BC7BD0 /* WebInspectorMessages.h */,
                                1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */,
                                1CA8B944127C882A00576C2B /* WebInspectorProxyMessages.h */,
-                               51A9E1241315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp */,
-                               51A9E1251315ED35009E7031 /* WebKeyValueStorageManagerMessages.h */,
-                               51A9E1261315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp */,
-                               51A9E1271315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h */,
                                33D3A3C41339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp */,
                                33D3A3C51339617900709BE4 /* WebMediaCacheManagerMessages.h */,
                                33D3A3C61339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp */,
                                1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */,
                                1C8E28341275D73800BC7BD0 /* WebInspectorProxy.h in Headers */,
                                1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
-                               1AAC4DE716B1CBF6009425E3 /* WebKeyValueStorageManager.h in Headers */,
-                               51A9E1291315ED35009E7031 /* WebKeyValueStorageManagerMessages.h in Headers */,
                                51A9E1061315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h in Headers */,
-                               51A9E12B1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h in Headers */,
                                BC59548915C7868500FD1E3E /* WebKit2.h in Headers */,
                                BCB63478116BF10600603215 /* WebKit2_C.h in Headers */,
                                BC9BA5051697C45300E44616 /* WebKit2Initialize.h in Headers */,
                                1CA8B936127C774E00576C2B /* WebInspectorProxyMac.mm in Sources */,
                                1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */,
                                C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */,
-                               1AAC4DE616B1CBF6009425E3 /* WebKeyValueStorageManager.cpp in Sources */,
-                               51A9E1281315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp in Sources */,
                                51A9E1051315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp in Sources */,
-                               51A9E12A1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp in Sources */,
                                7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */,
                                BC9BA5041697C45300E44616 /* WebKit2Initialize.cpp in Sources */,
                                BCB9E76211232B9E00A137E0 /* WebLoaderClient.cpp in Sources */,
diff --git a/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp b/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp
deleted file mode 100644 (file)
index 25a627c..0000000
+++ /dev/null
@@ -1,136 +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 "WebKeyValueStorageManager.h"
-
-#include "SecurityOriginData.h"
-#include "WebKeyValueStorageManagerMessages.h"
-#include "WebKeyValueStorageManagerProxyMessages.h"
-#include "WebProcess.h"
-#include "WebProcessCreationParameters.h"
-#include <WebCore/SecurityOrigin.h>
-#include <WebCore/SecurityOriginHash.h>
-#include <WebCore/StorageTracker.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-const char* WebKeyValueStorageManager::supplementName()
-{
-    return "WebKeyValueStorageManager";
-}
-
-WebKeyValueStorageManager::WebKeyValueStorageManager(WebProcess* process)
-    : m_process(process)
-    , m_didFinishLoadingOrigins(false)
-{
-    m_process->addMessageReceiver(Messages::WebKeyValueStorageManager::messageReceiverName(), this);
-}
-
-void WebKeyValueStorageManager::initialize(const WebProcessCreationParameters& parameters)
-{
-    StorageTracker::initializeTracker(parameters.localStorageDirectory, this);
-    m_localStorageDirectory = parameters.localStorageDirectory;
-#if ENABLE(INDEXED_DATABASE)
-    m_indexedDBDatabaseDirectory = parameters.databaseDirectory;
-#endif
-}
-
-static void keyValueStorageOriginIdentifiers(Vector<SecurityOriginData>& identifiers)
-{
-    ASSERT(identifiers.isEmpty());
-
-    Vector<RefPtr<SecurityOrigin>> coreOrigins;
-
-    StorageTracker::tracker().origins(coreOrigins);
-
-    size_t size = coreOrigins.size();
-    identifiers.reserveCapacity(size);
-
-    for (size_t i = 0; i < size; ++i) {
-        SecurityOriginData originData;
-
-        originData.protocol = coreOrigins[i]->protocol();
-        originData.host = coreOrigins[i]->host();
-        originData.port = coreOrigins[i]->port();
-
-        identifiers.uncheckedAppend(originData);
-    }
-}
-
-void WebKeyValueStorageManager::dispatchDidGetKeyValueStorageOrigins(const Vector<SecurityOriginData>& identifiers, uint64_t callbackID)
-{
-    m_process->send(Messages::WebKeyValueStorageManagerProxy::DidGetKeyValueStorageOrigins(identifiers, callbackID), 0);
-}
-
-void WebKeyValueStorageManager::getKeyValueStorageOrigins(uint64_t callbackID)
-{
-    if (!m_didFinishLoadingOrigins) {
-        m_originsRequestCallbackIDs.append(callbackID);
-        return;
-    }
-
-    Vector<SecurityOriginData> identifiers;
-    keyValueStorageOriginIdentifiers(identifiers);
-    dispatchDidGetKeyValueStorageOrigins(identifiers, callbackID);
-}
-
-void WebKeyValueStorageManager::didFinishLoadingOrigins()
-{
-    m_didFinishLoadingOrigins = true;
-
-    if (m_originsRequestCallbackIDs.isEmpty())
-        return;
-
-    Vector<SecurityOriginData> identifiers;
-    keyValueStorageOriginIdentifiers(identifiers);
-
-    for (size_t i = 0; i < m_originsRequestCallbackIDs.size(); ++i)
-        dispatchDidGetKeyValueStorageOrigins(identifiers, m_originsRequestCallbackIDs[i]);
-
-    m_originsRequestCallbackIDs.clear();
-}
-
-void WebKeyValueStorageManager::dispatchDidModifyOrigin(const String&)
-{
-}
-
-void WebKeyValueStorageManager::deleteEntriesForOrigin(const SecurityOriginData& originData)
-{
-    RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
-    if (!origin)
-        return;
-
-    StorageTracker::tracker().deleteOrigin(origin.get());
-}
-
-void WebKeyValueStorageManager::deleteAllEntries()
-{
-    StorageTracker::tracker().deleteAllOrigins();
-}
-
-} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h b/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h
deleted file mode 100644 (file)
index 5bad541..0000000
+++ /dev/null
@@ -1,83 +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 WebKeyValueStorageManager_h
-#define WebKeyValueStorageManager_h
-
-#include "MessageReceiver.h"
-#include "WebProcessSupplement.h"
-#include <WebCore/StorageTrackerClient.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-class WebProcess;
-struct SecurityOriginData;
-
-class WebKeyValueStorageManager : public WebCore::StorageTrackerClient, public WebProcessSupplement, public CoreIPC::MessageReceiver {
-    WTF_MAKE_NONCOPYABLE(WebKeyValueStorageManager);
-public:
-    explicit WebKeyValueStorageManager(WebProcess*);
-
-    static const char* supplementName();
-
-    const String& localStorageDirectory() const { return m_localStorageDirectory; }
-#if ENABLE(INDEXED_DATABASE)
-    const String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
-#endif
-
-private:
-    // WebProcessSupplement
-    virtual void initialize(const WebProcessCreationParameters&) OVERRIDE;
-
-    // CoreIPC::MessageReceiver
-    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
-
-    void getKeyValueStorageOrigins(uint64_t callbackID);
-    void deleteEntriesForOrigin(const SecurityOriginData&);
-    void deleteAllEntries();
-
-    void dispatchDidGetKeyValueStorageOrigins(const Vector<SecurityOriginData>& identifiers, uint64_t callbackID);
-
-    // WebCore::StorageTrackerClient
-    virtual void dispatchDidModifyOrigin(const String&) OVERRIDE;
-    virtual void didFinishLoadingOrigins() OVERRIDE;
-
-    WebProcess* m_process;
-
-    String m_localStorageDirectory;
-#if ENABLE(INDEXED_DATABASE)
-    String m_indexedDBDatabaseDirectory;
-#endif
-
-    Vector<uint64_t> m_originsRequestCallbackIDs;
-    bool m_didFinishLoadingOrigins;
-};
-
-} // namespace WebKit
-
-#endif // WebKeyValueStorageManager_h
diff --git a/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in b/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in
deleted file mode 100644 (file)
index 2f0d648..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2011 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 -> WebKeyValueStorageManager {
-    void GetKeyValueStorageOrigins(uint64_t callbackID)
-    void DeleteEntriesForOrigin(WebKit::SecurityOriginData originIdentifier)
-    void DeleteAllEntries()
-}
index d19146d..f6b2da6 100644 (file)
@@ -69,7 +69,6 @@
 #include "WebInspector.h"
 #include "WebInspectorClient.h"
 #include "WebInspectorMessages.h"
-#include "WebKeyValueStorageManager.h"
 #include "WebNotificationClient.h"
 #include "WebOpenPanelResultListener.h"
 #include "WebPageCreationParameters.h"
@@ -2484,8 +2483,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setFullScreenEnabled(store.getBoolValueForKey(WebPreferencesKey::fullScreenEnabledKey()));
 #endif
 
-    settings->setLocalStorageDatabasePath(WebProcess::shared().supplement<WebKeyValueStorageManager>()->localStorageDirectory());
-
 #if USE(AVFOUNDATION)
     settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
 #endif
index 23f4e18..b40483a 100644 (file)
@@ -42,7 +42,6 @@
 #include "WebFrameNetworkingContext.h"
 #include "WebGeolocationManager.h"
 #include "WebIconDatabaseProxy.h"
-#include "WebKeyValueStorageManager.h"
 #include "WebMediaCacheManager.h"
 #include "WebMemorySampler.h"
 #include "WebPage.h"
@@ -186,8 +185,6 @@ WebProcess::WebProcess()
     // FIXME: This should moved to where WebProcess::initialize is called,
     // so that ports have a chance to customize, and ifdefs in this file are
     // limited.
-    addSupplement<WebKeyValueStorageManager>();
-
     addSupplement<WebGeolocationManager>();
     addSupplement<WebApplicationCacheManager>();
     addSupplement<WebResourceCacheManager>();