Persist sessionStorage on disk.

chrome/browser/sessions/session_restore.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 "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 14 matching lines @@
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/session_storage_namespace.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/network_change_notifier.h"
 #include "webkit/glue/glue_serialize.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #endif
 
 using content::NavigationController;
@@ skipping 816 matching lines @@
     DCHECK(!tab.navigations.empty());
     int selected_index = tab.current_navigation_index;
     selected_index = std::max(
         0,
         std::min(selected_index,
                  static_cast<int>(tab.navigations.size() - 1)));
 
     RecordAppLaunchForTab(browser, tab, selected_index);
 
     WebContents* web_contents =
         browser->AddRestoredTab(tab.navigations,

[michaeln, 2012/05/30 01:29:19]

The last argument to the AddRestoredTab method is a
content::SessionStorageNamespace ptr. Could that be setup to refer to the
restored namespace from the git go?

It looks like the AddRestoredTab() and ResplaceRestoredTab() are used in
situations other than 'full session restore', which I imagine is to support
reopening rececently closed tabs via the popup menu on the bottom right of the
NTP. In that case, looks like the a reference to namespace being held by the
'Tab' struct is passed as a parameter to the restore methods.

When restoring a tab via full session restore, do we end up with a new or
modified 'Tab' struct? And does that struct end up referring to the correct
SessionStorageNamespace?

[marja, 2012/05/31 14:41:34]

1. Constructed a SessionStorageNamespace here and used it as the last parameter.

2. Yes.

3. If done like you suggested, the SessionService will write the correct
association between the new tab and the sessionStorage into its data when it
receives the "tab parented" notification. Not sure if this was what you meant?
New or modified Tab struct?

                                 tab_index,
                                 selected_index,
                                 tab.extension_app_id,
                                 false,  // select
                                 tab.pinned,
                                 true,
                                 NULL);
     // Regression check: check that the tab didn't start loading right away. The
     // focused tab will be loaded by Browser, and TabLoader will load the rest.
     DCHECK(web_contents->GetController().NeedsReload());
 
+    // Associate session storage.
+    if (tab.session_storage_real_id_associated) {
+      int64 namespace_id =
+          web_contents->GetController().GetSessionStorageNamespace()->id();
+      content::DOMStorageContext* dom_storage_context =
+          content::BrowserContext::GetDOMStorageContext(
+              web_contents->GetBrowserContext());
+      dom_storage_context-> AssociateSessionStorage(
+          namespace_id, tab.session_storage_real_id);
+    }
+
     // Set up the file access rights for the selected navigation entry.
     const int id = web_contents->GetRenderProcessHost()->GetID();
     const int read_file_permissions =
         base::PLATFORM_FILE_OPEN |
         base::PLATFORM_FILE_READ |
         base::PLATFORM_FILE_EXCLUSIVE_READ |
         base::PLATFORM_FILE_ASYNC;
     const std::string& state =
         tab.navigations.at(selected_index).state();
     const std::vector<FilePath>& file_paths =
@@ skipping 179 matching lines @@
   if (active_session_restorers == NULL)
     return false;
   for (std::set<SessionRestoreImpl*>::const_iterator it =
            active_session_restorers->begin();
        it != active_session_restorers->end(); ++it) {
     if ((*it)->profile() == profile)
       return true;
   }
   return false;
 }