Session restore: Store and restore persistent IDs for sessionStorage.

webkit/dom_storage/dom_storage_session.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 "webkit/dom_storage/dom_storage_session.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/tracked_objects.h"
 #include "webkit/dom_storage/dom_storage_context.h"
 #include "webkit/dom_storage/dom_storage_task_runner.h"
 
 namespace dom_storage {
 
 DomStorageSession::DomStorageSession(DomStorageContext* context)
     : context_(context),
       namespace_id_(context->AllocateSessionId()),
-      persistent_namespace_id_(context->AllocatePersistentSessionId()) {
+      persistent_namespace_id_(context->AllocatePersistentSessionId()),
+      should_persist_(false) {
   context->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CreateSessionNamespace,
                  context_, namespace_id_, persistent_namespace_id_));
 }
 
 DomStorageSession::DomStorageSession(DomStorageContext* context,
                                      const std::string& persistent_namespace_id)
     : context_(context),
       namespace_id_(context->AllocateSessionId()),
-      persistent_namespace_id_(persistent_namespace_id) {
+      persistent_namespace_id_(persistent_namespace_id),
+      should_persist_(false) {
   context->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CreateSessionNamespace,
                  context_, namespace_id_, persistent_namespace_id_));
 }
 
+void DomStorageSession::SetShouldPersist(bool should_persist) {
+  should_persist_ = should_persist;
+}
+
 DomStorageSession* DomStorageSession::Clone() {
   return CloneFrom(context_, namespace_id_);
 }
 
 // static
 DomStorageSession* DomStorageSession::CloneFrom(DomStorageContext* context,
                                                 int64 namepace_id_to_clone) {
   int64 clone_id = context->AllocateSessionId();
   std::string persistent_clone_id = context->AllocatePersistentSessionId();
   context->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CloneSessionNamespace,
                  context, namepace_id_to_clone, clone_id, persistent_clone_id));
   return new DomStorageSession(context, clone_id, persistent_clone_id);
 }
 
 DomStorageSession::DomStorageSession(DomStorageContext* context,
                                      int64 namespace_id,
                                      const std::string& persistent_namespace_id)
     : context_(context),
       namespace_id_(namespace_id),
       persistent_namespace_id_(persistent_namespace_id) {
   // This ctor is intended for use by the Clone() method.
 }
 
 DomStorageSession::~DomStorageSession() {
   context_->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::DeleteSessionNamespace,
-                 context_, namespace_id_));
+                 context_, namespace_id_, should_persist_));
 }
 
 }  // namespace dom_storage