Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6419)

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 18500005: Fix SessionStorage confusion between RenderViewHostImpl and NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: code review Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 957809f6210d445577fe1a0d5c97855e84acd0b5..6f7caf45e48a5922148d9db39b3eced4efd8577c 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -180,9 +180,8 @@ void PrerenderContents::PrepareForUse() {
SessionStorageNamespace* session_storage_namespace = NULL;
if (prerender_contents_) {
- // TODO(ajwong): This does not correctly handle storage for isolated apps.
session_storage_namespace = prerender_contents_->
- GetController().GetDefaultSessionStorageNamespace();
+ GetController().GetSessionStorageNamespace();
}
prerender_manager_->StartPendingPrerenders(
child_id_, &pending_prerenders_, session_storage_namespace);
@@ -474,12 +473,8 @@ size_t PrerenderContents::pending_prerender_count() const {
WebContents* PrerenderContents::CreateWebContents(
SessionStorageNamespace* session_storage_namespace) {
- // TODO(ajwong): Remove the temporary map once prerendering is aware of
- // multiple session storage namespaces per tab.
- content::SessionStorageNamespaceMap session_storage_namespace_map;
- session_storage_namespace_map[std::string()] = session_storage_namespace;
return WebContents::CreateWithSessionStorage(
- WebContents::CreateParams(profile_), session_storage_namespace_map);
+ WebContents::CreateParams(profile_), session_storage_namespace);
}
void PrerenderContents::NotifyPrerenderStart() {

Powered by Google App Engine
This is Rietveld 408576698