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

Unified Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 404613005: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile fix Created 6 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: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index a25aeba2e7496d540593fba2622b239992547ad9..8984f0991bca6f3d304125e24159ee3bc35f33ed 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -878,6 +878,15 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
RenderFrameHost* rfh,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const {
if (params.page_id == -1) {
+ // TODO(nasko, creis): An out-of-process child frame has no way of
+ // knowing the page_id of its parent, so it is passing back -1. The
+ // semantics here should be re-evaluated during session history refactor
+ // (see http://crbug.com/236848). For now, we assume this means the
+ // child frame loaded and proceed. Note that this may do the wrong thing
+ // for cross-process AUTO_SUBFRAME navigations.
+ if (rfh->IsCrossProcessSubframe())
+ return NAVIGATION_TYPE_NEW_SUBFRAME;
+
// The renderer generates the page IDs, and so if it gives us the invalid
// page ID (-1) we know it didn't actually navigate. This happens in a few
// cases:

Powered by Google App Engine
This is Rietveld 408576698