content/browser/web_contents/web_contents_impl.h - Issue 255543009: Ensure that modal dialogs from subframes can be cleaned up correctly.

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

Issue 255543009: Ensure that modal dialogs from subframes can be cleaned up correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Don't store a possibly deleted RFH Created 6 years, 8 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:

Index: content/browser/web_contents/web_contents_impl.h

diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h

index cc4f43502b0d9ee7419e13ba4d0953a1cfbc1711..604ff78c2487874571197bb65510993f84d8bd37 100644

--- a/content/browser/web_contents/web_contents_impl.h

+++ b/content/browser/web_contents/web_contents_impl.h

@@ -665,8 +665,11 @@ class CONTENT_EXPORT WebContentsImpl

// watching |web_contents|. No-op if there is no such observer.

void RemoveDestructionObserver(WebContentsImpl* web_contents);

- // Callback function when showing JavaScript dialogs.

- void OnDialogClosed(RenderFrameHost* rfh,

+ // Callback function when showing JavaScript dialogs. Takes in a routing ID

+ // pair to identify the RenderFrameHost that opened the dialog, because it's

+ // possible for the RenderFrameHost to be deleted by the time this is called.

+ void OnDialogClosed(int render_process_id,

+ int render_frame_id,

IPC::Message* reply_msg,

bool dialog_was_suppressed,

bool success,