Persist sessionStorage on disk.

webkit/dom_storage/dom_storage_namespace.cc

Index: webkit/dom_storage/dom_storage_namespace.cc
diff --git a/webkit/dom_storage/dom_storage_namespace.cc b/webkit/dom_storage/dom_storage_namespace.cc
index 656d244345258d5328f384241e07c3e2b7652ab5..e70e1ed0491ace3a3f584e92d63597536972a25f 100644
--- a/webkit/dom_storage/dom_storage_namespace.cc
+++ b/webkit/dom_storage/dom_storage_namespace.cc
@@ -5,10 +5,13 @@
 #include "webkit/dom_storage/dom_storage_namespace.h"
 
 #include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
 #include "webkit/dom_storage/dom_storage_area.h"
 #include "webkit/dom_storage/dom_storage_task_runner.h"
 #include "webkit/dom_storage/dom_storage_types.h"
+#include "webkit/dom_storage/session_storage_database.h"
 
 namespace dom_storage {
 
@@ -22,9 +25,13 @@ DomStorageNamespace::DomStorageNamespace(
 
 DomStorageNamespace::DomStorageNamespace(
     int64 namespace_id,
+    const std::string& persistent_namespace_id,
+    SessionStorageDatabase* session_storage_database,
     DomStorageTaskRunner* task_runner)
     : namespace_id_(namespace_id),
-      task_runner_(task_runner) {
+      persistent_namespace_id_(persistent_namespace_id),
+      task_runner_(task_runner),
+      session_storage_database_(session_storage_database) {
   DCHECK_NE(kLocalStorageNamespaceId, namespace_id);
 }
 
@@ -36,8 +43,13 @@ DomStorageArea* DomStorageNamespace::OpenStorageArea(const GURL& origin) {
     ++(holder->open_count_);
     return holder->area_;
   }
-  DomStorageArea* area = new DomStorageArea(namespace_id_, origin,
-                                            directory_, task_runner_);
+  DomStorageArea* area;
+  if (namespace_id_ == kLocalStorageNamespaceId) {
+    area = new DomStorageArea(namespace_id_, origin, directory_, task_runner_);
+  } else {
+    area = new DomStorageArea(namespace_id_, persistent_namespace_id_, origin,
+                              session_storage_database_, task_runner_);
+  }
   areas_[origin] = AreaHolder(area, 1);
   return area;
 }
@@ -51,20 +63,36 @@ void DomStorageNamespace::CloseStorageArea(DomStorageArea* area) {
   // The in-process-webkit based impl didn't do this either, but would be nice.
 }
 
-DomStorageNamespace* DomStorageNamespace::Clone(int64 clone_namespace_id) {
+DomStorageNamespace* DomStorageNamespace::Clone(
+    int64 clone_namespace_id,
+    const std::string& clone_persistent_namespace_id) {
   DCHECK_NE(kLocalStorageNamespaceId, namespace_id_);
   DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id);
-  DomStorageNamespace* clone =
-      new DomStorageNamespace(clone_namespace_id, task_runner_);
+  DomStorageNamespace* clone = new DomStorageNamespace(
+      clone_namespace_id, clone_persistent_namespace_id,
+      session_storage_database_, task_runner_);
   AreaMap::const_iterator it = areas_.begin();
+  // Clone the in-memory structures.
   for (; it != areas_.end(); ++it) {
-    DomStorageArea* area = it->second.area_->ShallowCopy(clone_namespace_id);
+    DomStorageArea* area = it->second.area_->ShallowCopy(
+        clone_namespace_id, clone_persistent_namespace_id);
     clone->areas_[it->first] = AreaHolder(area, 0);
   }
+  // And clone the on-disk structures, too.
+  if (session_storage_database_.get()) {
+    bool success = task_runner_->PostShutdownBlockingTask(
+        FROM_HERE,
+        DomStorageTaskRunner::COMMIT_SEQUENCE,
+        base::Bind(base::IgnoreResult(&SessionStorageDatabase::CloneNamespace),
+                   session_storage_database_.get(), persistent_namespace_id_,
+                   clone_persistent_namespace_id));
+    DCHECK(success);
+  }
   return clone;
 }
 
 void DomStorageNamespace::DeleteOrigin(const GURL& origin) {
+  DCHECK(!session_storage_database_.get());
   AreaHolder* holder = GetAreaHolder(origin);
   if (holder) {
     holder->area_->DeleteOrigin();