content/browser/web_contents/navigation_controller_impl.cc - Issue 12210048: Prevent bindings escalation on an existing NavigationEntry (attempt 2).

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/web_contents/navigation_controller_impl.cc

Issue 12210048: Prevent bindings escalation on an existing NavigationEntry (attempt 2). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change URL in test. Created 7 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/sessions/session_restore_browsertest.cc ('k') | content/browser/web_contents/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/navigation_controller_impl.cc

diff --git a/content/browser/web_contents/navigation_controller_impl.cc b/content/browser/web_contents/navigation_controller_impl.cc

index e9bf27289ae65c53d3eb4a04b1d486aa8d679e72..3996bb4329cfac198a37e146f58ac330b5a0100d 100644

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

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

@@ -936,6 +936,11 @@ bool NavigationControllerImpl::RendererDidNavigate(

// The active entry's SiteInstance should match our SiteInstance.

DCHECK(active_entry->site_instance() == web_contents_->GetSiteInstance());

+ // Remember the bindings the renderer process has at this point, so that

+ // we do not grant this entry additional bindings if we come back to it.

+ active_entry->SetBindings(

+ web_contents_->GetRenderViewHost()->GetEnabledBindings());

// Now prep the rest of the details for the notification and broadcast.

details->entry = active_entry;

details->is_main_frame =