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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1163303003: PlzNavigate: Create the speculative renderer earlier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Method renames and comment updates. Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 } 694 }
695 } 695 }
696 return false; 696 return false;
697 } 697 }
698 698
699 void RenderFrameHostManager::ResetProxyHosts() { 699 void RenderFrameHostManager::ResetProxyHosts() {
700 STLDeleteValues(&proxy_hosts_); 700 STLDeleteValues(&proxy_hosts_);
701 } 701 }
702 702
703 // PlzNavigate 703 // PlzNavigate
704 void RenderFrameHostManager::BeginNavigation(const NavigationRequest& request) { 704 void RenderFrameHostManager::DidCreateNavigationRequest(
705 const NavigationRequest& request) {
705 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( 706 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
706 switches::kEnableBrowserSideNavigation)); 707 switches::kEnableBrowserSideNavigation));
707 // Clean up any state in case there's an ongoing navigation. 708 // Clean up any state in case there's an ongoing navigation.
708 // TODO(carlosk): remove this cleanup here once we properly cancel ongoing 709 // TODO(carlosk): remove this cleanup here once we properly cancel ongoing
709 // navigations. 710 // navigations.
710 CleanUpNavigation(); 711 CleanUpNavigation();
711 712
712 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(request); 713 RenderFrameHostImpl* dest_rfh = GetFrameHostForNavigation(request);
713 DCHECK(dest_rfh); 714 DCHECK(dest_rfh);
714 } 715 }
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after
2183 void RenderFrameHostManager::DeleteRenderFrameProxyHost( 2184 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
2184 SiteInstance* instance) { 2185 SiteInstance* instance) {
2185 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); 2186 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
2186 if (iter != proxy_hosts_.end()) { 2187 if (iter != proxy_hosts_.end()) {
2187 delete iter->second; 2188 delete iter->second;
2188 proxy_hosts_.erase(iter); 2189 proxy_hosts_.erase(iter);
2189 } 2190 }
2190 } 2191 }
2191 2192
2192 } // namespace content 2193 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.h ('k') | content/browser/security_exploit_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698