Diff
Modified: trunk/Source/WebKit2/ChangeLog (140710 => 140711)
--- trunk/Source/WebKit2/ChangeLog 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-24 20:46:28 UTC (rev 140711)
@@ -1,3 +1,17 @@
+2013-01-24 Anders Carlsson <ander...@apple.com>
+
+ Move WebKeyValueStorageManager to WebProcess/Storage.
+
+ Rubber-stamped by Sam Weinig.
+
+ Try this again, with DerivedSources.make correctly updated this time.
+
+ * DerivedSources.make:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/Storage/WebKeyValueStorageManager.cpp: Renamed from Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp.
+ * WebProcess/Storage/WebKeyValueStorageManager.h: Renamed from Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h.
+ * WebProcess/Storage/WebKeyValueStorageManager.messages.in: Renamed from Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.messages.in.
+
2013-01-24 Christophe Dumez <christophe.du...@intel.com>
[EFL][WK2] Use C API inside ewk_favicon_database
Modified: trunk/Source/WebKit2/DerivedSources.make (140710 => 140711)
--- trunk/Source/WebKit2/DerivedSources.make 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/DerivedSources.make 2013-01-24 20:46:28 UTC (rev 140711)
@@ -36,12 +36,12 @@
$(WebKit2)/WebProcess/FullScreen \
$(WebKit2)/WebProcess/Geolocation \
$(WebKit2)/WebProcess/IconDatabase \
- $(WebKit2)/WebProcess/KeyValueStorage \
$(WebKit2)/WebProcess/MediaCache \
$(WebKit2)/WebProcess/Network \
$(WebKit2)/WebProcess/Notifications \
$(WebKit2)/WebProcess/Plugins \
$(WebKit2)/WebProcess/ResourceCache \
+ $(WebKit2)/WebProcess/Storage \
$(WebKit2)/WebProcess/WebCoreSupport \
$(WebKit2)/WebProcess/WebPage \
$(WebKit2)/WebProcess \
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (140710 => 140711)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-24 20:46:28 UTC (rev 140711)
@@ -216,6 +216,8 @@
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 */; };
@@ -494,8 +496,6 @@
51A7F2F3125BF820008AEB1D /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A7F2F2125BF820008AEB1D /* Logging.h */; };
51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */; };
51A84CE3127F386B00CA6EA4 /* WebContextMenuProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */; };
- 51A9E0FF1315CCDE009E7031 /* WebKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E0FC1315CCDE009E7031 /* WebKeyValueStorageManager.cpp */; };
- 51A9E1001315CCDE009E7031 /* WebKeyValueStorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E0FD1315CCDE009E7031 /* WebKeyValueStorageManager.h */; };
51A9E1051315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1021315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp */; };
51A9E1061315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9E1031315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h */; };
51A9E10A1315CD18009E7031 /* WKKeyValueStorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A9E1081315CD18009E7031 /* WKKeyValueStorageManager.cpp */; };
@@ -1452,6 +1452,9 @@
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>"; };
@@ -1763,9 +1766,6 @@
51A8A6121627F325000D90E9 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = Network/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProcessMac.mm; sourceTree = "<group>"; };
51A8A6171627F5BB000D90E9 /* NetworkProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkProcess.messages.in; path = NetworkProcess/NetworkProcess.messages.in; sourceTree = "<group>"; };
- 51A9E0FC1315CCDE009E7031 /* WebKeyValueStorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebKeyValueStorageManager.cpp; path = KeyValueStorage/WebKeyValueStorageManager.cpp; sourceTree = "<group>"; };
- 51A9E0FD1315CCDE009E7031 /* WebKeyValueStorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebKeyValueStorageManager.h; path = KeyValueStorage/WebKeyValueStorageManager.h; sourceTree = "<group>"; };
- 51A9E0FE1315CCDE009E7031 /* WebKeyValueStorageManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebKeyValueStorageManager.messages.in; path = KeyValueStorage/WebKeyValueStorageManager.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>"; };
@@ -2146,7 +2146,7 @@
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>"; };
- BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContentForDevelopment.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContentForDevelopment.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = com.apple.WebKit.WebContentForDevelopment.xpc; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
BCAE9DEF160C097500A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BCAE9E01160C12DA00A33217 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = WebProcessService/Info.plist; sourceTree = "<group>"; };
BCAE9E04160C137800A33217 /* WebProcessServiceForWebKitDevelopmentMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessServiceForWebKitDevelopmentMain.mm; sourceTree = "<group>"; };
@@ -2782,6 +2782,16 @@
path = cg;
sourceTree = "<group>";
};
+ 1AAC4DDE16B1CBF6009425E3 /* Storage */ = {
+ isa = PBXGroup;
+ children = (
+ 1AAC4DE116B1CBF6009425E3 /* WebKeyValueStorageManager.cpp */,
+ 1AAC4DE216B1CBF6009425E3 /* WebKeyValueStorageManager.h */,
+ 1AAC4DE316B1CBF6009425E3 /* WebKeyValueStorageManager.messages.in */,
+ );
+ path = Storage;
+ sourceTree = "<group>";
+ };
1AADDF4B10D82AF000D3D63D /* Shared */ = {
isa = PBXGroup;
children = (
@@ -3303,16 +3313,6 @@
name = Network;
sourceTree = "<group>";
};
- 51A9E0FB1315CC0E009E7031 /* KeyValueStorage */ = {
- isa = PBXGroup;
- children = (
- 51A9E0FC1315CCDE009E7031 /* WebKeyValueStorageManager.cpp */,
- 51A9E0FD1315CCDE009E7031 /* WebKeyValueStorageManager.h */,
- 51A9E0FE1315CCDE009E7031 /* WebKeyValueStorageManager.messages.in */,
- );
- name = KeyValueStorage;
- sourceTree = "<group>";
- };
51B15A7D138439B200321AD8 /* unix */ = {
isa = PBXGroup;
children = (
@@ -3403,13 +3403,13 @@
BC0E5FCB12D696DD0012A72A /* Geolocation */,
51FBB9C1132E079200F327B4 /* IconDatabase */,
BC204EDF11C83E72008F3375 /* InjectedBundle */,
- 51A9E0FB1315CC0E009E7031 /* KeyValueStorage */,
1A6FA01C11E1526300DB1371 /* mac */,
33D3A3BD1339609800709BE4 /* MediaCache */,
5105B0D2162F7A5E00E27709 /* Network */,
31099974146C8AA80029DEB9 /* Notifications (User) */,
1A6FB7AA11E64B4900DB1371 /* Plugins */,
3336762B130C9978006C9DE2 /* ResourceCache */,
+ 1AAC4DDE16B1CBF6009425E3 /* Storage */,
BC032D5D10F437220058C15A /* WebCoreSupport */,
BC032D5E10F4372B0058C15A /* WebPage */,
BCE9C0CF1485965D00E33D61 /* WebConnectionToUIProcess.cpp */,
@@ -4842,7 +4842,6 @@
1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */,
1C8E28341275D73800BC7BD0 /* WebInspectorProxy.h in Headers */,
1CA8B946127C882A00576C2B /* WebInspectorProxyMessages.h in Headers */,
- 51A9E1001315CCDE009E7031 /* WebKeyValueStorageManager.h in Headers */,
51A9E1291315ED35009E7031 /* WebKeyValueStorageManagerMessages.h in Headers */,
51A9E1061315CCFC009E7031 /* WebKeyValueStorageManagerProxy.h in Headers */,
51A9E12B1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessages.h in Headers */,
@@ -5060,6 +5059,7 @@
51815BA016A622210054501F /* SyncNetworkResourceLoader.h in Headers */,
519B4FF516A9EA970066874D /* SchedulableLoader.h in Headers */,
E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
+ 1AAC4DE716B1CBF6009425E3 /* WebKeyValueStorageManager.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5846,7 +5846,6 @@
1CA8B936127C774E00576C2B /* WebInspectorProxyMac.mm in Sources */,
1CA8B945127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp in Sources */,
C0337DD3127A2A0E008FF4F4 /* WebKeyboardEvent.cpp in Sources */,
- 51A9E0FF1315CCDE009E7031 /* WebKeyValueStorageManager.cpp in Sources */,
51A9E1281315ED35009E7031 /* WebKeyValueStorageManagerMessageReceiver.cpp in Sources */,
51A9E1051315CCFC009E7031 /* WebKeyValueStorageManagerProxy.cpp in Sources */,
51A9E12A1315ED35009E7031 /* WebKeyValueStorageManagerProxyMessageReceiver.cpp in Sources */,
@@ -6039,6 +6038,7 @@
51815B9F16A622210054501F /* SyncNetworkResourceLoader.cpp in Sources */,
519B4FF416A9EA970066874D /* SchedulableLoader.cpp in Sources */,
E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */,
+ 1AAC4DE616B1CBF6009425E3 /* WebKeyValueStorageManager.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp (140710 => 140711)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-24 20:46:28 UTC (rev 140711)
@@ -1,134 +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.
- */
-
-#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 AtomicString& WebKeyValueStorageManager::supplementName()
-{
- DEFINE_STATIC_LOCAL(AtomicString, name, ("WebKeyValueStorageManager", AtomicString::ConstructFromLiteral));
- return name;
-}
-
-WebKeyValueStorageManager::WebKeyValueStorageManager(WebProcess* process)
- : m_process(process)
-{
- 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 (!StorageTracker::tracker().originsLoaded()) {
- m_originsRequestCallbackIDs.append(callbackID);
- return;
- }
-
- Vector<SecurityOriginData> identifiers;
- keyValueStorageOriginIdentifiers(identifiers);
- dispatchDidGetKeyValueStorageOrigins(identifiers, callbackID);
-}
-
-void WebKeyValueStorageManager::didFinishLoadingOrigins()
-{
- 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
Deleted: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h (140710 => 140711)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h 2013-01-24 20:46:28 UTC (rev 140711)
@@ -1,80 +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.
- */
-
-#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 AtomicString& 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::MessageID, 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;
-
- Vector<uint64_t> m_originsRequestCallbackIDs;
- String m_localStorageDirectory;
-#if ENABLE(INDEXED_DATABASE)
- String m_indexedDBDatabaseDirectory;
-#endif
- WebProcess* m_process;
-};
-
-} // namespace WebKit
-
-#endif // WebKeyValueStorageManager_h
Deleted: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.messages.in (140710 => 140711)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.messages.in 2013-01-24 20:42:52 UTC (rev 140710)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.messages.in 2013-01-24 20:46:28 UTC (rev 140711)
@@ -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()
-}
Copied: trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp (from rev 140702, trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp) (0 => 140711)
--- trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp 2013-01-24 20:46:28 UTC (rev 140711)
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+#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 AtomicString& WebKeyValueStorageManager::supplementName()
+{
+ DEFINE_STATIC_LOCAL(AtomicString, name, ("WebKeyValueStorageManager", AtomicString::ConstructFromLiteral));
+ return name;
+}
+
+WebKeyValueStorageManager::WebKeyValueStorageManager(WebProcess* process)
+ : m_process(process)
+{
+ 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 (!StorageTracker::tracker().originsLoaded()) {
+ m_originsRequestCallbackIDs.append(callbackID);
+ return;
+ }
+
+ Vector<SecurityOriginData> identifiers;
+ keyValueStorageOriginIdentifiers(identifiers);
+ dispatchDidGetKeyValueStorageOrigins(identifiers, callbackID);
+}
+
+void WebKeyValueStorageManager::didFinishLoadingOrigins()
+{
+ 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
Copied: trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h (from rev 140702, trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h) (0 => 140711)
--- trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h 2013-01-24 20:46:28 UTC (rev 140711)
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+#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 AtomicString& 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::MessageID, 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;
+
+ Vector<uint64_t> m_originsRequestCallbackIDs;
+ String m_localStorageDirectory;
+#if ENABLE(INDEXED_DATABASE)
+ String m_indexedDBDatabaseDirectory;
+#endif
+ WebProcess* m_process;
+};
+
+} // namespace WebKit
+
+#endif // WebKeyValueStorageManager_h
Copied: trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in (from rev 140702, trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.messages.in) (0 => 140711)
--- trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in (rev 0)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.messages.in 2013-01-24 20:46:28 UTC (rev 140711)
@@ -0,0 +1,27 @@
+# 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()
+}
