content/browser/frame_host/navigation_controller_impl.cc - Issue 1755733002: Revert of Solidify Entry discarding logic (NavigationHandle keeps its ID)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1755733002: Revert of Solidify Entry discarding logic (NavigationHandle keeps its ID) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e24b58e84c6d09a62902022699c380921c95f04c..f2e503f27193b7aee70e15656895db65f383b17b 100644

--- a/content/browser/frame_host/navigation_controller_impl.cc

+++ b/content/browser/frame_host/navigation_controller_impl.cc

@@ -57,7 +57,6 @@

#include "content/browser/frame_host/interstitial_page_impl.h"

#include "content/browser/frame_host/navigation_entry_impl.h"

#include "content/browser/frame_host/navigation_entry_screenshot_manager.h"

-#include "content/browser/frame_host/navigation_handle_impl.h"

#include "content/browser/frame_host/navigator.h"

#include "content/browser/renderer_host/render_view_host_impl.h" // Temporary

#include "content/browser/site_instance_impl.h"

@@ -1099,19 +1098,12 @@

scoped_ptr<NavigationEntryImpl> new_entry;

bool update_virtual_url;

// Only make a copy of the pending entry if it is appropriate for the new page

- // that was just loaded. Verify this by checking if the entry corresponds

- // to the current navigation handle. Note that in some tests the render frame

- // host does not have a valid handle. Additionally, coarsely check that:

- // 1. The SiteInstance hasn't been assigned to something else.

- // 2. The pending entry was intended as a new entry, rather than being a

- // history navigation that was interrupted by an unrelated,

- // renderer-initiated navigation.

- // TODO(csharrison): Investigate whether we can remove some of the coarser

- // checks.

- NavigationHandleImpl* handle = rfh->navigation_handle();

- if (pending_entry_ && handle &&

- handle->pending_nav_entry_id() == pending_entry_->GetUniqueID() &&

- pending_entry_index_ == -1 &&

+ // that was just loaded. We verify this at a coarse grain by checking that

+ // the SiteInstance hasn't been assigned to something else, and by making sure

+ // that the pending entry was intended as a new entry (rather than being a

+ // history navigation that was interrupted by an unrelated, renderer-initiated

+ // navigation).

+ if (pending_entry_ && pending_entry_index_ == -1 &&

(!pending_entry_->site_instance() ||

pending_entry_->site_instance() == rfh->GetSiteInstance())) {

new_entry = pending_entry_->Clone();