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

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

Issue 2346673002: Fix for non-live RenderFramehosts incorrectly marked as live. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1835 // a load start for any of its inner WebContents. Eventually, that also makes 1835 // a load start for any of its inner WebContents. Eventually, that also makes
1836 // the FrameTree never see the matching load stop. Therefore, we always pass 1836 // the FrameTree never see the matching load stop. Therefore, we always pass
1837 // false to |is_loading| below. 1837 // false to |is_loading| below.
1838 // TODO(lazyboy): This |is_loading| behavior might not be what we want, 1838 // TODO(lazyboy): This |is_loading| behavior might not be what we want,
1839 // investigate and fix. 1839 // investigate and fix.
1840 render_frame_host->Send(new FrameMsg_SwapOut( 1840 render_frame_host->Send(new FrameMsg_SwapOut(
1841 render_frame_host->GetRoutingID(), proxy->GetRoutingID(), 1841 render_frame_host->GetRoutingID(), proxy->GetRoutingID(),
1842 false /* is_loading */, 1842 false /* is_loading */,
1843 render_frame_host->frame_tree_node()->current_replication_state())); 1843 render_frame_host->frame_tree_node()->current_replication_state()));
1844 proxy->set_render_frame_proxy_created(true); 1844 proxy->set_render_frame_proxy_created(true);
1845
1846 // There is no longer a RenderFrame associated with this RenderFrameHost.
1847 render_frame_host->SetRenderFrameCreated(false);
1845 } 1848 }
1846 1849
1847 void RenderFrameHostManager::SetRWHViewForInnerContents( 1850 void RenderFrameHostManager::SetRWHViewForInnerContents(
1848 RenderWidgetHostView* child_rwhv) { 1851 RenderWidgetHostView* child_rwhv) {
1849 DCHECK(ForInnerDelegate() && frame_tree_node_->IsMainFrame()); 1852 DCHECK(ForInnerDelegate() && frame_tree_node_->IsMainFrame());
1850 GetProxyToOuterDelegate()->SetChildRWHView(child_rwhv); 1853 GetProxyToOuterDelegate()->SetChildRWHView(child_rwhv);
1851 } 1854 }
1852 1855
1853 bool RenderFrameHostManager::InitRenderView( 1856 bool RenderFrameHostManager::InitRenderView(
1854 RenderViewHostImpl* render_view_host, 1857 RenderViewHostImpl* render_view_host,
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
2675 resolved_url)) { 2678 resolved_url)) {
2676 DCHECK(!dest_instance || 2679 DCHECK(!dest_instance ||
2677 dest_instance == render_frame_host_->GetSiteInstance()); 2680 dest_instance == render_frame_host_->GetSiteInstance());
2678 return false; 2681 return false;
2679 } 2682 }
2680 2683
2681 return true; 2684 return true;
2682 } 2685 }
2683 2686
2684 } // namespace content 2687 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698