content/browser/frame_host/render_frame_host_manager.h - Issue 2208933002: Don't load subframe history items if a client redirect occurs during load.

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/render_frame_host_manager.h

Issue 2208933002: Don't load subframe history items if a client redirect occurs during load. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Limit to subframe case. Created 4 years, 4 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 | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | content/renderer/render_frame_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager.h

diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h

index 663ea40eff755c7b66f7bbba6d613e6cfdfe5a1a..dd08ac2f96e11a9dcd9a1f16c914f201f70cfb81 100644

--- a/content/browser/frame_host/render_frame_host_manager.h

+++ b/content/browser/frame_host/render_frame_host_manager.h

@@ -515,6 +515,9 @@ class CONTENT_EXPORT RenderFrameHostManager

bool InitRenderView(RenderViewHostImpl* render_view_host,

RenderFrameProxyHost* proxy);

+ // Terminates and deletes the pending RenderFrameHost.

+ void CancelPending();

private:

friend class NavigatorTestWithBrowserSideNavigation;

friend class RenderFrameHostManagerTest;

@@ -710,10 +713,6 @@ class CONTENT_EXPORT RenderFrameHostManager

void DiscardUnusedFrame(

std::unique_ptr<RenderFrameHostImpl> render_frame_host);

- // Helper method to terminate the pending RenderFrameHost. The frame may be

- // deleted immediately, or it may be kept around in hopes of later reuse.

- void CancelPending();

// Clears pending_render_frame_host_, returning it to the caller for disposal.

std::unique_ptr<RenderFrameHostImpl> UnsetPendingRenderFrameHost();