Create and store persistent unique ids for sessionStorage.

webkit/dom_storage/dom_storage_namespace.h

Index: webkit/dom_storage/dom_storage_namespace.h
diff --git a/webkit/dom_storage/dom_storage_namespace.h b/webkit/dom_storage/dom_storage_namespace.h
index 6063266a498ff242114bd9748f384b59abe15d37..2e60e1b70c928060220b0de2879c60feed50e525 100644
--- a/webkit/dom_storage/dom_storage_namespace.h
+++ b/webkit/dom_storage/dom_storage_namespace.h
@@ -32,9 +32,13 @@ class DomStorageNamespace
   // Constructor for a SessionStorage namespace with a non-zero id
   // and no backing directory on disk.
   DomStorageNamespace(int64 namespace_id,
+                      const std::string& persistent_namespace_id,
                       DomStorageTaskRunner* task_runner);
 
   int64 namespace_id() const { return namespace_id_; }
+  std::string persistent_namespace_id() const {

[michaeln, 2012/06/14 22:53:48]

could the return value here be const string&

[marja, 2012/06/15 09:17:42]

I think so; it would be invalid if the string was used after the
DomStorageNamespace is deleted, but I don't think that would easily happen.

(const references keep temporaries alive, but in this case it wouldn't keep the
string which is|was a member variable alive any longer... right?)

+    return persistent_namespace_id_;
+  }
 
   // Returns the storage area for the given origin,
   // creating instance if needed. Each call to open
@@ -45,7 +49,8 @@ class DomStorageNamespace
   // Creates a clone of |this| namespace including
   // shallow copies of all contained areas.
   // Should only be called for session storage namespaces.
-  DomStorageNamespace* Clone(int64 clone_namespace_id);
+  DomStorageNamespace* Clone(int64 clone_namespace_id,
+                             const std::string& clone_persistent_namespace_id);
 
   void DeleteOrigin(const GURL& origin);
   void PurgeMemory();
@@ -71,6 +76,7 @@ class DomStorageNamespace
   AreaHolder* GetAreaHolder(const GURL& origin);
 
   int64 namespace_id_;
+  std::string persistent_namespace_id_;
   FilePath directory_;
   AreaMap areas_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;