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

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

Issue 1048463004: PlzNavigate: track pending commits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved state tracking to RFH Created 5 years, 8 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 816 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 if (!navigation_rfh->IsRenderFrameLive()) { 827 if (!navigation_rfh->IsRenderFrameLive()) {
828 // Recreate the opener chain. 828 // Recreate the opener chain.
829 int opener_route_id = delegate_->CreateOpenerRenderViewsForRenderManager( 829 int opener_route_id = delegate_->CreateOpenerRenderViewsForRenderManager(
830 navigation_rfh->GetSiteInstance()); 830 navigation_rfh->GetSiteInstance());
831 if (!InitRenderView(navigation_rfh->render_view_host(), opener_route_id, 831 if (!InitRenderView(navigation_rfh->render_view_host(), opener_route_id,
832 MSG_ROUTING_NONE, frame_tree_node_->IsMainFrame())) { 832 MSG_ROUTING_NONE, frame_tree_node_->IsMainFrame())) {
833 return nullptr; 833 return nullptr;
834 } 834 }
835 } 835 }
836 836
837 cross_navigation_pending_ = navigation_rfh != render_frame_host_.get();
838 return navigation_rfh; 837 return navigation_rfh;
839 } 838 }
840 839
841 // PlzNavigate 840 // PlzNavigate
842 void RenderFrameHostManager::CleanUpNavigation() { 841 void RenderFrameHostManager::CleanUpNavigation() {
843 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( 842 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
844 switches::kEnableBrowserSideNavigation)); 843 switches::kEnableBrowserSideNavigation));
845 speculative_web_ui_.reset(); 844 speculative_web_ui_.reset();
846 should_reuse_web_ui_ = false; 845 should_reuse_web_ui_ = false;
847 if (speculative_render_frame_host_) 846 if (speculative_render_frame_host_)
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 void RenderFrameHostManager::DeleteRenderFrameProxyHost( 2089 void RenderFrameHostManager::DeleteRenderFrameProxyHost(
2091 SiteInstance* instance) { 2090 SiteInstance* instance) {
2092 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId()); 2091 RenderFrameProxyHostMap::iterator iter = proxy_hosts_.find(instance->GetId());
2093 if (iter != proxy_hosts_.end()) { 2092 if (iter != proxy_hosts_.end()) {
2094 delete iter->second; 2093 delete iter->second;
2095 proxy_hosts_.erase(iter); 2094 proxy_hosts_.erase(iter);
2096 } 2095 }
2097 } 2096 }
2098 2097
2099 } // namespace content 2098 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698