Persist sessionStorage on disk.

content/browser/dom_storage/dom_storage_context_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop_proxy.h"
+#include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/database/database_util.h"
 #include "webkit/dom_storage/dom_storage_area.h"
 #include "webkit/dom_storage/dom_storage_context.h"
 #include "webkit/dom_storage/dom_storage_task_runner.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserThread;
 using content::DOMStorageContext;
 using dom_storage::DomStorageArea;
 using dom_storage::DomStorageContext;
 using dom_storage::DomStorageTaskRunner;
 using dom_storage::DomStorageWorkerPoolTaskRunner;
 using webkit_database::DatabaseUtil;
 
 namespace {
 
 const char kLocalStorageDirectory[] = "Local Storage";
+const char kSessionStorageDirectory[] = "Session Storage";
 
 // TODO(michaeln): Fix the content layer api, FilePaths and
 // string16 origin_ids are just wrong. Then get rid of
 // this conversion non-sense. Most of the includes are just
 // to support that non-sense.
 
 GURL OriginIdToGURL(const string16& origin_id) {
   return DatabaseUtil::GetOriginFromIdentifier(origin_id);
 }
 
@@ skipping 33 matching lines @@
   reply_loop->PostTask(
       FROM_HERE,
       base::Bind(&InvokeAllStorageFilesCallbackHelper,
                  callback, paths));
 }
 
 }  // namespace
 
 DOMStorageContextImpl::DOMStorageContextImpl(
     const FilePath& data_path,
-    quota::SpecialStoragePolicy* special_storage_policy) {
+    quota::SpecialStoragePolicy* special_storage_policy,
+    bool session_storage_on_disk) {
   base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool();
-  // TODO(marja): Pass a nonempty session storage directory when session storage
-  // is backed on disk.
   context_ = new dom_storage::DomStorageContext(
       data_path.empty() ?
           data_path : data_path.AppendASCII(kLocalStorageDirectory),
-      FilePath(),  // Empty session storage directory.
+      (data_path.empty() || !session_storage_on_disk) ?
+          data_path : data_path.AppendASCII(kSessionStorageDirectory),
       special_storage_policy,
       new DomStorageWorkerPoolTaskRunner(
           worker_pool,
           worker_pool->GetNamedSequenceToken("dom_storage_primary"),
           worker_pool->GetNamedSequenceToken("dom_storage_commit"),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
 }
 
 DOMStorageContextImpl::~DOMStorageContextImpl() {
 }
@@ skipping 35 matching lines @@
 
 void DOMStorageContextImpl::DeleteDataModifiedSince(const base::Time& cutoff) {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::DeleteDataModifiedSince, context_,
                  cutoff));
 }
 
+void DOMStorageContextImpl::DoomSessionStorage(int64 namespace_id) {
+  DCHECK(context_);
+  context_->task_runner()->PostShutdownBlockingTask(
+      FROM_HERE,
+      DomStorageTaskRunner::PRIMARY_SEQUENCE,
+      base::Bind(&DomStorageContext::DoomSessionStorage, context_,
+                 namespace_id));
+}
+
+content::SessionStorageNamespace* DOMStorageContextImpl::CreateSessionStorage(
+    const std::string& persistent_id) {
+  return new SessionStorageNamespaceImpl(this, persistent_id);
+}
+
 void DOMStorageContextImpl::PurgeMemory() {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::PurgeMemory, context_));
 }
 
 void DOMStorageContextImpl::SetClearLocalState(bool clear_local_state) {
   DCHECK(context_);
@@ skipping 17 matching lines @@
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::Shutdown, context_));
 }
 
 int64 DOMStorageContextImpl::LeakyCloneSessionStorage(
     int64 existing_namespace_id) {
   DCHECK(context_);
   int64 clone_id = context_->AllocateSessionId();
+  std::string clone_persistent_id = context_->AllocatePersistentSessionId();
   context_->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CloneSessionNamespace, context_,
-                 existing_namespace_id, clone_id));
+                 existing_namespace_id, clone_id, clone_persistent_id));
   return clone_id;
 }