diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 02:42:55 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 02:42:55 +0000 |
| commit | 76bfc7f5d06ab704d404a86866d8358675914545 (patch) | |
| tree | 9881325d5709b9bda157083446418b0c97ee8cf6 /chrome/browser/predictors | |
| parent | ccd2b97cc77ec7ff17756c01ec835a83c325375a (diff) | |
| download | chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.zip chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.tar.gz chromium_src-76bfc7f5d06ab704d404a86866d8358675914545.tar.bz2 | |
Fix SessionStorage confusion between RenderViewHostImpl and NavigationController.
Both RenderViewHostImpl and NavigationController had SessionStorageNamespace*,
and under some circumstances, they pointed to different
SessionStorageNamespaces* which is wrong.
This also cleans up some storage partition code, since we're not going to have
multiple SessionStorageNamespaces.
For more information, see bug.
BUG=138152
Review URL: https://chromiumcodereview.appspot.com/18500005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/predictors')
| -rw-r--r-- | chrome/browser/predictors/autocomplete_action_predictor.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/predictors/autocomplete_action_predictor.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index 2b9e732..5a1e75b 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -138,7 +138,7 @@ void AutocompleteActionPredictor::ClearTransitionalMatches() { void AutocompleteActionPredictor::StartPrerendering( const GURL& url, - const content::SessionStorageNamespaceMap& session_storage_namespace_map, + content::SessionStorageNamespace* session_storage_namespace, const gfx::Size& size) { // Only cancel the old prerender after starting the new one, so if the URLs // are the same, the underlying prerender will be reused. @@ -146,11 +146,6 @@ void AutocompleteActionPredictor::StartPrerendering( prerender_handle_.release()); if (prerender::PrerenderManager* prerender_manager = prerender::PrerenderManagerFactory::GetForProfile(profile_)) { - content::SessionStorageNamespace* session_storage_namespace = NULL; - content::SessionStorageNamespaceMap::const_iterator it = - session_storage_namespace_map.find(std::string()); - if (it != session_storage_namespace_map.end()) - session_storage_namespace = it->second.get(); prerender_handle_.reset(prerender_manager->AddPrerenderFromOmnibox( url, session_storage_namespace, size)); } diff --git a/chrome/browser/predictors/autocomplete_action_predictor.h b/chrome/browser/predictors/autocomplete_action_predictor.h index b1c4f97..762d31a 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.h +++ b/chrome/browser/predictors/autocomplete_action_predictor.h @@ -98,7 +98,7 @@ class AutocompleteActionPredictor // prerenders (if any). void StartPrerendering( const GURL& url, - const content::SessionStorageNamespaceMap& session_storage_namespace_map, + content::SessionStorageNamespace* session_storage_namespace, const gfx::Size& size); // Return true if the suggestion type warrants a TCP/IP preconnection. |