Diff
Modified: trunk/Source/WebKit2/ChangeLog (141023 => 141024)
--- trunk/Source/WebKit2/ChangeLog 2013-01-29 00:02:01 UTC (rev 141023)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-29 00:08:21 UTC (rev 141024)
@@ -1,5 +1,19 @@
2013-01-28 Anders Carlsson <[email protected]>
+ Add StorageManager class
+ https://bugs.webkit.org/show_bug.cgi?id=108127
+
+ Reviewed by Sam Weinig.
+
+ The StorageManager will be in charge of handling access to local and session storage
+ in the UI process.
+
+ * UIProcess/Storage/StorageManager.cpp: Added.
+ * UIProcess/Storage/StorageManager.h: Added.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2013-01-28 Anders Carlsson <[email protected]>
+
More work on UI side local storage
https://bugs.webkit.org/show_bug.cgi?id=108119
Added: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (0 => 141024)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-01-29 00:08:21 UTC (rev 141024)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 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 "StorageManager.h"
+
+namespace WebKit {
+
+StorageManager::StorageManager()
+{
+}
+
+StorageManager::~StorageManager()
+{
+}
+
+} // namespace WebKit
Added: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (0 => 141024)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-01-29 00:08:21 UTC (rev 141024)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 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 StorageManager_h
+#define StorageManager_h
+
+namespace WebKit {
+
+class StorageManager {
+public:
+ StorageManager();
+ ~StorageManager();
+
+private:
+};
+
+} // namespace WebKit
+
+#endif // StorageManager_h
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (141023 => 141024)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-01-29 00:02:01 UTC (rev 141023)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-01-29 00:08:21 UTC (rev 141024)
@@ -35,6 +35,7 @@
#include "PlugInAutoStartProvider.h"
#include "PluginInfoStore.h"
#include "ProcessModel.h"
+#include "StorageManager.h"
#include "VisitedLinkProvider.h"
#include "WebContextClient.h"
#include "WebContextConnectionClient.h"
@@ -420,6 +421,8 @@
RefPtr<WebPluginSiteDataManager> m_pluginSiteDataManager;
#endif
+ StorageManager m_storageManager;
+
typedef HashMap<AtomicString, RefPtr<WebContextSupplement> > WebContextSupplementMap;
WebContextSupplementMap m_supplements;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (141023 => 141024)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-29 00:02:01 UTC (rev 141023)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-29 00:08:21 UTC (rev 141024)
@@ -132,6 +132,8 @@
1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
1A44B95716B737AA00B7BBD8 /* StorageNamespaceProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17635416B1D5D000D88FD6 /* StorageNamespaceProxy.cpp */; };
+ 1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */; };
+ 1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */; };
1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */; };
1A4A9AA912B7E796008FE984 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9AA712B7E796008FE984 /* WKTextInputWindowController.mm */; };
1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */; };
@@ -1393,6 +1395,8 @@
1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiverMap.h; sourceTree = "<group>"; };
1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiver.h; sourceTree = "<group>"; };
1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
+ 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageManager.cpp; sourceTree = "<group>"; };
+ 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageManager.h; sourceTree = "<group>"; };
1A4A9AA612B7E796008FE984 /* WKTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKTextInputWindowController.h; sourceTree = "<group>"; };
1A4A9AA712B7E796008FE984 /* WKTextInputWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKTextInputWindowController.mm; sourceTree = "<group>"; };
1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePluginModule.cpp; sourceTree = "<group>"; };
@@ -2726,6 +2730,15 @@
path = mac;
sourceTree = "<group>";
};
+ 1A44B95816B73F8C00B7BBD8 /* Storage */ = {
+ isa = PBXGroup;
+ children = (
+ 1A44B95916B73F9F00B7BBD8 /* StorageManager.cpp */,
+ 1A44B95A16B73F9F00B7BBD8 /* StorageManager.h */,
+ );
+ path = Storage;
+ sourceTree = "<group>";
+ };
1A4A9C5212B816CF008FE984 /* Netscape */ = {
isa = PBXGroup;
children = (
@@ -3620,6 +3633,7 @@
31A2EC401489973700810D71 /* Notifications */,
1AEFCC0511D01F34008219D3 /* Plugins */,
E1EDFDAA1628878E0039ECDA /* SharedWorkers */,
+ 1A44B95816B73F8C00B7BBD8 /* Storage */,
1A64256712DE42EC00CAAE2C /* BackingStore.cpp */,
1A64256612DE42EC00CAAE2C /* BackingStore.h */,
BC2652121182608100243E12 /* DrawingAreaProxy.cpp */,
@@ -4949,6 +4963,7 @@
1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */,
1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */,
1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
+ 1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
1A0EC603124A9F2C007EF4A5 /* PluginProcessManager.h in Headers */,
1A0EC6C0124BBD9B007EF4A5 /* PluginProcessMessages.h in Headers */,
1A0EC75E124BC7B2007EF4A5 /* PluginProcessProxy.h in Headers */,
@@ -6224,6 +6239,7 @@
33D3A3C81339617900709BE4 /* WebMediaCacheManagerMessageReceiver.cpp in Sources */,
33D3A3BA1339606200709BE4 /* WebMediaCacheManagerProxy.cpp in Sources */,
33D3A3CA1339617900709BE4 /* WebMediaCacheManagerProxyMessageReceiver.cpp in Sources */,
+ 1A44B95B16B73F9F00B7BBD8 /* StorageManager.cpp in Sources */,
909854EC12BC4E17000AD080 /* WebMemorySampler.cpp in Sources */,
909854EE12BC4E18000AD080 /* WebMemorySampler.mac.mm in Sources */,
C0337DB0127A28D0008FF4F4 /* WebMouseEvent.cpp in Sources */,