Persist sessionStorage on disk.

webkit/dom_storage/dom_storage_area.h

Index: webkit/dom_storage/dom_storage_area.h
diff --git a/webkit/dom_storage/dom_storage_area.h b/webkit/dom_storage/dom_storage_area.h
index 0bad246431725068a34e97242d199f3b8b36b20b..2cf6483878af56d3afe275d73ea8ff9431ecfba2 100644
--- a/webkit/dom_storage/dom_storage_area.h
+++ b/webkit/dom_storage/dom_storage_area.h
@@ -19,6 +19,7 @@ namespace dom_storage {
 
 class DomStorageMap;
 class DomStorageTaskRunner;
+class SessionStorageDatabase;
 
 // Container for a per-origin Map of key/value pairs potentially
 // backed by storage on disk and lazily commits changes to disk.
@@ -31,11 +32,23 @@ class DomStorageArea
   static FilePath DatabaseFileNameFromOrigin(const GURL& origin);
   static GURL OriginFromDatabaseFileName(const FilePath& file_name);
 
+  // Local storage backed on disk.
   DomStorageArea(int64 namespace_id,
                  const GURL& origin,
                  const FilePath& directory,
                  DomStorageTaskRunner* task_runner);
 
+  // Session storage backed on disk.
+  DomStorageArea(int64 namespace_id,
+                 const GURL& origin,
+                 SessionStorageDatabase* session_storage_backing,
+                 DomStorageTaskRunner* task_runner);
+
+  // Local storage or session storage in memory.
+  DomStorageArea(int64 namespace_id,
+                 const GURL& origin,
+                 DomStorageTaskRunner* task_runner);
+
   const GURL& origin() const { return origin_; }
   int64 namespace_id() const { return namespace_id_; }
 
@@ -100,14 +113,18 @@ class DomStorageArea
 
   void ShutdownInCommitSequence();
 
+  DomStorageDatabase* GetBacking() const;
+
   int64 namespace_id_;
   GURL origin_;
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
   scoped_ptr<DomStorageDatabase> backing_;
+  scoped_refptr<SessionStorageDatabase> session_storage_backing_;
   bool is_initial_import_done_;
   bool is_shutdown_;
+  bool is_shallow_copy_;
   scoped_ptr<CommitBatch> commit_batch_;
   scoped_ptr<CommitBatch> in_flight_commit_batch_;
 };