summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host/navigation_controller_impl.cc
diff options
context:
space:
mode:
authorrobliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 21:49:25 +0000
committerrobliao@chromium.org <robliao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 21:49:25 +0000
commitada2df7b3cb581b2bacef3effe7161a233e1e883 (patch)
tree6ccad55ce009cd720df36ec197b9fcfab9a46bf7 /content/browser/frame_host/navigation_controller_impl.cc
parent23140050877c5a5bef19628c24f3eab732c4e4f1 (diff)
downloadchromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.zip
chromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.tar.gz
chromium_src-ada2df7b3cb581b2bacef3effe7161a233e1e883.tar.bz2
Revert of Start using RenderFrameProxyHost objects. (https://codereview.chromium.org/444503002/)
Reason for revert: Appears to have destabilized RenderFrameHostManagerTest.AllowTargetedNavigationsAfterSwap Original issue's description: > Start using RenderFrameProxyHost objects. > > Instantiate RenderFrameProxyHost objects for remote frames when using > --site-per-process. > > BUG=357747, 399709, 399775, 400594 > TBR=kenrb, creis, kalman > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=287557 TBR=kenrb@chromium.org,creis@chromium.org,kalman@chromium.org,nick@chromium.org NOTREECHECKS=true NOTRY=true BUG=357747, 399709, 399775, 400594 Review URL: https://codereview.chromium.org/438393004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.cc')
-rw-r--r--content/browser/frame_host/navigation_controller_impl.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 3997cae..a602741 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -883,15 +883,6 @@ 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: