Restore sessionStorage when chrome restarts.

chrome/browser/sessions/session_restore.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 "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "content/browser/in_process_webkit/dom_storage_namespace.h"
+#include "content/browser/in_process_webkit/session_storage_namespace.h"
+#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 641 matching lines @@
   void RestoreTabsToBrowser(const SessionWindow& window,
                             Browser* browser,
                             int selected_tab_index) {
     DCHECK(!window.tabs.empty());
     int initial_tab_count = browser->tab_count();
     for (std::vector<SessionTab*>::const_iterator i = window.tabs.begin();
          i != window.tabs.end(); ++i) {
       const SessionTab& tab = *(*i);
       const int tab_index = static_cast<int>(i - window.tabs.begin()) +
           initial_tab_count;
       // Don't schedule a load for the selected tab, as ShowBrowser() will

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

Does this mean the navigation to the top most url on the stack has already
happened (or is happening concurrently)? If so, is there a race here between the
page creating a new empty sessionStorage namespace and the logic under
RestoreTab to reanimate an save one?

[marja, 2012/01/17 16:21:49]

Afaics, both callers of this func, SessionRestoreImpl::RestoreForeignSession and
SessionRestoreImpl::ProcessSessionWindows call ShowBrowser after calling this
function. I don't understand why the comment says "will already have done"
instead of "will do".

       // already have done that.
       RestoreTab(tab, tab_index, browser,
                  tab_index != (selected_tab_index + initial_tab_count));
     }
   }
 
   void RestoreTab(const SessionTab& tab,
                   const int tab_index,
                   Browser* browser,
                   bool schedule_load) {
@@ skipping 18 matching lines @@
 
     TabContents* tab_contents =
         browser->AddRestoredTab(tab.navigations,
                                 tab_index,
                                 selected_index,
                                 tab.extension_app_id,
                                 false,
                                 tab.pinned,
                                 true,
                                 NULL);
+    int64 namespace_id =
+        tab_contents->controller().session_storage_namespace()->id();
+
+    DOMStorageContext* dom_storage_context =
+        tab_contents->browser_context()->GetWebKitContext()->
+        dom_storage_context();
+
+    content::BrowserThread::PostTask(
+        content::BrowserThread::WEBKIT, FROM_HERE,
+        base::Bind(&SessionRestoreImpl::RestoreSessionStorage,
+                   base::Unretained(this), dom_storage_context, namespace_id,

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

what ensures 'this' is still valid when the task executes?

[marja, 2012/01/17 16:21:49]

This is fixed now; WebKitContext is refcounted.

+                   tab.session_storage_directory));
+
     if (schedule_load)
       tab_loader_->ScheduleLoad(&tab_contents->controller());
   }
 
+  void RestoreSessionStorage(DOMStorageContext* dom_storage_context,
+                             int64 namespace_id,
+                             const FilePath& session_storage_directory) {
+    dom_storage_context->RecreateSessionStorageNamespace(
+        namespace_id, session_storage_directory);
+  }
+
   Browser* CreateRestoredBrowser(Browser::Type type,
                                  gfx::Rect bounds,
                                  ui::WindowShowState show_state) {
     Browser* browser = new Browser(type, profile_);
     browser->set_override_bounds(bounds);
     browser->set_show_state(show_state);
     browser->set_is_session_restore(true);
     browser->InitBrowserWindow();
     return browser;
   }
@@ skipping 151 matching lines @@
   std::vector<GURL> gurls;
   SessionRestoreImpl restorer(profile,
       static_cast<Browser*>(NULL), true, false, true, gurls);
   restorer.RestoreForeignTab(tab);
 }
 
 // static
 bool SessionRestore::IsRestoring() {
   return restoring;
 }