Changeset 148154 in webkit

Timestamp:

Apr 10, 2013 5:02:01 PM (11 years ago)

Author:

andersca@apple.com

Message:

Add a stubbed out StorageAreaMap class
​https://bugs.webkit.org/show_bug.cgi?id=114392

Reviewed by Andreas Kling.

The intention is that StorageAreaMap is going to take over responsibility for storing the storage values in the
web process, as well as dispatching events. A StorageAreaMap will be shared between multiple StorageAreaImpl objects,
for example if multiple frames with the same origin use local storage.

• DerivedSources.make:
• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::StorageArea::dispatchEvents):
(WebKit::StorageManager::setItem):

• WebKit2.xcodeproj/project.pbxproj:
• WebProcess/Storage/StorageAreaImpl.cpp:

(WebKit::StorageAreaImpl::StorageAreaImpl):
(WebKit::StorageAreaImpl::~StorageAreaImpl):

• WebProcess/Storage/StorageAreaMap.cpp: Added.

(WebKit):
(WebKit::StorageAreaMap::create):
(WebKit::StorageAreaMap::StorageAreaMap):
(WebKit::StorageAreaMap::~StorageAreaMap):
(WebKit::StorageAreaMap::didSetItem):
(WebKit::StorageAreaMap::dispatchStorageEvent):

• WebProcess/Storage/StorageAreaMap.h: Added.

(WebKit):
(StorageAreaMap):

• WebProcess/Storage/StorageAreaMap.messages.in: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaImpl.messages.in.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (3 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (10 diffs)
• WebProcess/Storage/StorageAreaImpl.cpp (modified) (3 diffs)
• WebProcess/Storage/StorageAreaMap.cpp (added)
• WebProcess/Storage/StorageAreaMap.h (added)
• WebProcess/Storage/StorageAreaMap.messages.in (moved) (moved from trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.messages.in) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-10  Anders Carlsson  <andersca@apple.com>
+
+        Add a stubbed out StorageAreaMap class
+        https://bugs.webkit.org/show_bug.cgi?id=114392
+
+        Reviewed by Andreas Kling.
+
+        The intention is that StorageAreaMap is going to take over responsibility for storing the storage values in the
+        web process, as well as dispatching events. A StorageAreaMap will be shared between multiple StorageAreaImpl objects,
+        for example if multiple frames with the same origin use local storage.
+
+        * DerivedSources.make:
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::StorageArea::dispatchEvents):
+        (WebKit::StorageManager::setItem):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/Storage/StorageAreaImpl.cpp:
+        (WebKit::StorageAreaImpl::StorageAreaImpl):
+        (WebKit::StorageAreaImpl::~StorageAreaImpl):
+        * WebProcess/Storage/StorageAreaMap.cpp: Added.
+        (WebKit):
+        (WebKit::StorageAreaMap::create):
+        (WebKit::StorageAreaMap::StorageAreaMap):
+        (WebKit::StorageAreaMap::~StorageAreaMap):
+        (WebKit::StorageAreaMap::didSetItem):
+        (WebKit::StorageAreaMap::dispatchStorageEvent):
+        * WebProcess/Storage/StorageAreaMap.h: Added.
+        (WebKit):
+        (StorageAreaMap):
+        * WebProcess/Storage/StorageAreaMap.messages.in: Renamed from Source/WebKit2/WebProcess/Storage/StorageAreaImpl.messages.in.
+
 2013-04-10  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/DerivedSources.make

@@ -91 +91 @@
     SecItemShim \
     SecItemShimProxy \
-    StorageAreaImpl \
+    StorageAreaMap \
     WebContext \
     WebDatabaseManager \

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -28 +28 @@
 
 #include "SecurityOriginData.h"
-#include "StorageAreaImplMessages.h"
+#include "StorageAreaMapMessages.h"
 #include "StorageManagerMessages.h"
 #include "WebProcessProxy.h"
@@ -104 +104 @@
         }
 
-        it->first->send(Messages::StorageAreaImpl::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
+        it->first->send(Messages::StorageAreaMap::DispatchStorageEvent(key, oldValue, newValue, urlString), it->second);
     }
 }
@@ -274 +274 @@
     bool quotaError;
     storageArea->setItem(connection, storageAreaID, key, value, urlString, quotaError);
-    connection->send(Messages::StorageAreaImpl::DidSetItem(key, quotaError), storageAreaID);
+    connection->send(Messages::StorageAreaMap::DidSetItem(key, quotaError), storageAreaID);
 }
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -122 +122 @@
                 1A30066E1110F4F70031937C /* ResponsivenessTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */; };
                 1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */; };
-                1A334DED16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */; };
-                1A334DEE16DE8F88006A8E38 /* StorageAreaImplMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */; };
+                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
+                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
                 1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
                 1A3979F71332983F00E00300 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
@@ -255 +255 @@
                 1AC8702D130B49A2002C1257 /* WebPluginSiteDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC8702B130B49A2002C1257 /* WebPluginSiteDataManager.h */; };
                 1AC8702E130B49A2002C1257 /* WebPluginSiteDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */; };
+                1ACECD2417162DB1001FC9EF /* StorageAreaMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */; };
+                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */; };
                 1AD25E95167AB08100EA9BCD /* DownloadProxyMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */; };
                 1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
@@ -1485 +1487 @@
                 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponsivenessTimer.h; sourceTree = "<group>"; };
                 1A30EAC5115D7DA30053E937 /* ConnectionMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConnectionMac.cpp; sourceTree = "<group>"; };
-                1A334DEA16DE8B68006A8E38 /* StorageAreaImpl.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaImpl.messages.in; sourceTree = "<group>"; };
-                1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImplMessageReceiver.cpp; sourceTree = "<group>"; };
-                1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaImplMessages.h; sourceTree = "<group>"; };
+                1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageAreaMap.messages.in; sourceTree = "<group>"; };
+                1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
+                1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; };
                 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginModuleInfo.cpp; sourceTree = "<group>"; };
                 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
@@ -1637 +1639 @@
                 1AC8702B130B49A2002C1257 /* WebPluginSiteDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginSiteDataManager.h; sourceTree = "<group>"; };
                 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginSiteDataManager.cpp; sourceTree = "<group>"; };
+                1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMap.cpp; sourceTree = "<group>"; };
+                1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMap.h; sourceTree = "<group>"; };
                 1AD25E93167AB08100EA9BCD /* DownloadProxyMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxyMap.cpp; sourceTree = "<group>"; };
                 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
@@ -3092 +3096 @@
                                 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */,
                                 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */,
-                                1A334DEA16DE8B68006A8E38 /* StorageAreaImpl.messages.in */,
+                                1A334DEA16DE8B68006A8E38 /* StorageAreaMap.messages.in */,
+                                1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */,
+                                1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */,
                                 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */,
                                 1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */,
@@ -4916 +4922 @@
                                 E1EDFDB31628AD730039ECDA /* SharedWorkerProcessProxyMessageReceiver.cpp */,
                                 E1EDFDB41628AD730039ECDA /* SharedWorkerProcessProxyMessages.h */,
-                                1A334DEB16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp */,
-                                1A334DEC16DE8F88006A8E38 /* StorageAreaImplMessages.h */,
+                                1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */,
+                                1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */,
                                 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */,
                                 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */,
@@ -5247 +5253 @@
                                 5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */,
                                 513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
+                                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
                                 BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
                                 51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
@@ -5472 +5479 @@
                                 31D5929F166E060000E6BF02 /* WebPlugInClient.h in Headers */,
                                 1AC8702D130B49A2002C1257 /* WebPluginSiteDataManager.h in Headers */,
-                                1A334DEE16DE8F88006A8E38 /* StorageAreaImplMessages.h in Headers */,
+                                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
                                 BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */,
                                 BC5744F012638FB3006F0F12 /* WebPopupItem.h in Headers */,
@@ -6345 +6352 @@
                                 E1A31735134CEA80007C9A4F /* AttributedString.mm in Sources */,
                                 512F589612A8838800629530 /* AuthenticationChallengeProxy.cpp in Sources */,
-                                1A334DED16DE8F88006A8E38 /* StorageAreaImplMessageReceiver.cpp in Sources */,
+                                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */,
                                 512F589812A8838800629530 /* AuthenticationDecisionListener.cpp in Sources */,
                                 518E8EF816B2091C00E91429 /* AuthenticationManager.cpp in Sources */,
@@ -6821 +6828 @@
                                 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */,
                                 BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
+                                1ACECD2417162DB1001FC9EF /* StorageAreaMap.cpp in Sources */,
                                 BC4075FF124FF0270068F20A /* WKMutableDictionary.cpp in Sources */,
                                 BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */,

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp

@@ -28 +28 @@
 
 #include "SecurityOriginData.h"
-#include "StorageAreaImplMessages.h"
+#include "StorageAreaMapMessages.h"
 #include "StorageManagerMessages.h"
 #include "StorageNamespaceImpl.h"
@@ -61 +61 @@
 {
     WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
-    WebProcess::shared().addMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID, this);
+    WebProcess::shared().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageAreaID, this);
 }
 
@@ -67 +67 @@
 {
     WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageArea(m_storageAreaID), 0);
-    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaImpl::messageReceiverName(), m_storageAreaID);
+    WebProcess::shared().removeMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageAreaID);
 }
 

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.messages.in

@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-messages -> StorageAreaImpl {
+messages -> StorageAreaMap {
     DidSetItem(WTF::String key, bool quotaException)