Changeset 143277 in webkit

Timestamp:

Feb 18, 2013 5:22:48 PM (11 years ago)

Author:

andersca@apple.com

Message:

Begin stubbing out session storage classes
​https://bugs.webkit.org/show_bug.cgi?id=110168

Reviewed by Andreas Kling.

• UIProcess/Storage/StorageManager.cpp:

(StorageManager::StorageArea):
(WebKit):
(WebKit::StorageManager::StorageArea::create):
(WebKit::StorageManager::StorageArea::StorageArea):
(WebKit::StorageManager::StorageArea::~StorageArea):
(StorageManager::SessionStorageNamespace):
(WebKit::StorageManager::SessionStorageNamespace::isEmpty):
(WebKit::StorageManager::SessionStorageNamespace::create):
(WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
(WebKit::StorageManager::SessionStorageNamespace::~SessionStorageNamespace):
(WebKit::StorageManager::SessionStorageNamespace::cloneTo):
(WebKit::StorageManager::createSessionStorageNamespaceInternal):
(WebKit::StorageManager::destroySessionStorageNamespaceInternal):
(WebKit::StorageManager::cloneSessionStorageNamespaceInternal):

• UIProcess/Storage/StorageManager.h:

(StorageManager):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (2 diffs)
• UIProcess/Storage/StorageManager.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-18  Anders Carlsson  <andersca@apple.com>
+
+        Begin stubbing out session storage classes
+        https://bugs.webkit.org/show_bug.cgi?id=110168
+
+        Reviewed by Andreas Kling.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (StorageManager::StorageArea):
+        (WebKit):
+        (WebKit::StorageManager::StorageArea::create):
+        (WebKit::StorageManager::StorageArea::StorageArea):
+        (WebKit::StorageManager::StorageArea::~StorageArea):
+        (StorageManager::SessionStorageNamespace):
+        (WebKit::StorageManager::SessionStorageNamespace::isEmpty):
+        (WebKit::StorageManager::SessionStorageNamespace::create):
+        (WebKit::StorageManager::SessionStorageNamespace::SessionStorageNamespace):
+        (WebKit::StorageManager::SessionStorageNamespace::~SessionStorageNamespace):
+        (WebKit::StorageManager::SessionStorageNamespace::cloneTo):
+        (WebKit::StorageManager::createSessionStorageNamespaceInternal):
+        (WebKit::StorageManager::destroySessionStorageNamespaceInternal):
+        (WebKit::StorageManager::cloneSessionStorageNamespaceInternal):
+        * UIProcess/Storage/StorageManager.h:
+        (StorageManager):
+
 2013-02-18  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

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

@@ -30 +30 @@
 #include "WebProcessProxy.h"
 #include "WorkQueue.h"
+#include <WebCore/SecurityOriginHash.h>
+
+using namespace WebCore;
 
 namespace WebKit {
+
+class StorageManager::StorageArea : public ThreadSafeRefCounted<StorageManager::StorageArea> {
+public:
+    static PassRefPtr<StorageArea> create();
+    ~StorageArea();
+
+private:
+    StorageArea();
+};
+
+PassRefPtr<StorageManager::StorageArea> StorageManager::StorageArea::create()
+{
+    return adoptRef(new StorageArea());
+}
+
+StorageManager::StorageArea::StorageArea()
+{
+}
+
+StorageManager::StorageArea::~StorageArea()
+{
+}
+
+class StorageManager::SessionStorageNamespace : public ThreadSafeRefCounted<SessionStorageNamespace> {
+public:
+    static PassRefPtr<SessionStorageNamespace> create();
+    ~SessionStorageNamespace();
+
+    bool isEmpty() const { return m_storageAreaMap.isEmpty(); }
+
+    void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
+
+private:
+    SessionStorageNamespace();
+
+    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>, SecurityOriginHash> m_storageAreaMap;
+};
+
+PassRefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create()
+{
+    return adoptRef(new SessionStorageNamespace());
+}
+
+StorageManager::SessionStorageNamespace::SessionStorageNamespace()
+{
+}
+
+StorageManager::SessionStorageNamespace::~SessionStorageNamespace()
+{
+}
+
+void StorageManager::SessionStorageNamespace::cloneTo(SessionStorageNamespace& newSessionStorageNamespace)
+{
+    ASSERT(newSessionStorageNamespace.isEmpty());
+
+    // FIXME: Implement.
+}
 
 PassRefPtr<StorageManager> StorageManager::create()
@@ -89 +149 @@
 void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID)
 {
-    // FIXME: Implement.
+    ASSERT(!m_sessionStorageNamespaces.contains(storageNamespaceID));
+
+    m_sessionStorageNamespaces.set(storageNamespaceID, SessionStorageNamespace::create());
 }
 
 void StorageManager::destroySessionStorageNamespaceInternal(uint64_t storageNamespaceID)
 {
-    // FIXME: Implement.
+    ASSERT(m_sessionStorageNamespaces.contains(storageNamespaceID));
+
+    m_sessionStorageNamespaces.remove(storageNamespaceID);
 }
 
 void StorageManager::cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID)
 {
-    // FIXME: Implement.
+    SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID).get();
+    ASSERT(sessionStorageNamespace);
+
+    SessionStorageNamespace* newSessionStorageNamespace = m_sessionStorageNamespaces.get(newStorageNamespaceID).get();
+    ASSERT(newSessionStorageNamespace);
+
+    sessionStorageNamespace->cloneTo(*newSessionStorageNamespace);
 }
 

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

@@ -68 +68 @@
 
     RefPtr<WorkQueue> m_queue;
+
+    class SessionStorageNamespace;
+    HashMap<uint64_t, RefPtr<SessionStorageNamespace> > m_sessionStorageNamespaces;
+
+    class StorageArea;
 };