Restore sessionStorage when chrome restarts.

content/browser/in_process_webkit/dom_storage_context.cc

 // Copyright (c) 2011 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/in_process_webkit/dom_storage_context.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 34 matching lines @@
       file_util::Delete(file_path, false);
     }
   }
 }
 
 }  // namespace
 
 const FilePath::CharType DOMStorageContext::kLocalStorageDirectory[] =
     FILE_PATH_LITERAL("Local Storage");
 
+const FilePath::CharType DOMStorageContext::kSessionStorageDirectory[] =
+    FILE_PATH_LITERAL("Session Storage");
+
 const FilePath::CharType DOMStorageContext::kLocalStorageExtension[] =
     FILE_PATH_LITERAL(".localstorage");
 
 DOMStorageContext::DOMStorageContext(
     WebKitContext* webkit_context,
     quota::SpecialStoragePolicy* special_storage_policy)
     : last_storage_area_id_(0),
       last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
       last_session_storage_namespace_id_on_io_thread_(kLocalStorageNamespaceId),
       clear_local_state_on_exit_(false),
@@ skipping 92 matching lines @@
   StorageNamespaceMap::iterator iter = storage_namespace_map_.find(id);
   if (iter != storage_namespace_map_.end())
     return iter->second;
   if (!allocation_allowed)
     return NULL;
   if (id == kLocalStorageNamespaceId)
     return CreateLocalStorage();
   return CreateSessionStorage(id);
 }
 
+DOMStorageNamespace* DOMStorageContext::RecreateSessionStorageNamespace(
+    int64 id,
+    const FilePath& session_storage_directory) {
+  FilePath dir_path;
+  if (!data_path_.empty()) {
+    dir_path = data_path_.Append(kSessionStorageDirectory)

[michaeln, 2011/12/13 20:40:03]

in what circumstances is data_path_ empty, i'm guessing for incognito?

[marja, 2012/01/11 15:17:53]

Yes.

+        .Append(session_storage_directory);
+  }
+  DOMStorageNamespace* new_namespace =
+      DOMStorageNamespace::CreateSessionStorageNamespace(this, dir_path, id);
+  RegisterStorageNamespace(new_namespace);
+  return new_namespace;
+}
+
 void DOMStorageContext::RegisterMessageFilter(
     DOMStorageMessageFilter* message_filter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(message_filter_set_.find(message_filter) ==
          message_filter_set_.end());
   message_filter_set_.insert(message_filter);
 }
 
 void DOMStorageContext::UnregisterMessageFilter(
     DOMStorageMessageFilter* message_filter) {
@@ skipping 81 matching lines @@
   if (!data_path_.empty())
     dir_path = data_path_.Append(kLocalStorageDirectory);
   DOMStorageNamespace* new_namespace =
       DOMStorageNamespace::CreateLocalStorageNamespace(this, dir_path);
   RegisterStorageNamespace(new_namespace);
   return new_namespace;
 }
 
 DOMStorageNamespace* DOMStorageContext::CreateSessionStorage(
     int64 namespace_id) {
+  FilePath dir_path;
+  if (!data_path_.empty()) {
+    // We cannot use derive the directory name for the sessionStorage databases

[jochen (gone - plz use gerrit), 2011/12/13 13:47:32]

remove "use"

[marja, 2012/01/11 15:17:53]

Done.

+    // directly from |namespace_id|. There is no guarantee that the same
+    // directory won't be created before we restore the session.

[michaeln, 2011/12/13 20:40:03]

can you say more about the latter part of the comment?

[marja, 2012/01/11 15:17:53]

This was inaccurate, changed it to "There is no guarantee that the same
namespace ID won't be reused before we restore the session."

+    file_util::CreateDirectory(data_path_.Append(kSessionStorageDirectory));
+    file_util::CreateTemporaryDirInDir(
+        data_path_.Append(kSessionStorageDirectory), "", &dir_path);

[michaeln, 2011/12/13 20:40:03]

where/when are these directories deleted?

[marja, 2012/01/11 15:17:53]

The deletion code is not yet in this CL, but the directories will be deleted
during a clean shutdown if we know we're not going to restore the session on the
next startup, and we'd also need to delete the stray ones after a crash if the
user doesn't restore the session...

+  }
   DOMStorageNamespace* new_namespace =
-      DOMStorageNamespace::CreateSessionStorageNamespace(this, namespace_id);
+      DOMStorageNamespace::CreateSessionStorageNamespace(this, dir_path,
+                                                         namespace_id);
   RegisterStorageNamespace(new_namespace);
   return new_namespace;
 }
 
 void DOMStorageContext::RegisterStorageNamespace(
     DOMStorageNamespace* storage_namespace) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   int64 id = storage_namespace->id();
   DCHECK(!GetStorageNamespace(id, false));
   storage_namespace_map_[id] = storage_namespace;
@@ skipping 11 matching lines @@
 }
 
 FilePath DOMStorageContext::GetLocalStorageFilePath(
     const string16& origin_id) const {
   FilePath storageDir = data_path_.Append(
       DOMStorageContext::kLocalStorageDirectory);
   FilePath::StringType id =
       webkit_glue::WebStringToFilePathString(origin_id);
   return storageDir.Append(id.append(kLocalStorageExtension));
 }