chrome/renderer/extensions/user_script_slave.cc - Issue 112203003: Fix renderer crashes when frame gets detached while injectng user scripts.

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: chrome/renderer/extensions/user_script_slave.cc

Issue 112203003: Fix renderer crashes when frame gets detached while injectng user scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added render view browser tests that perform synchronous frame removal on loading finished. Created 6 years, 11 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

Index: chrome/renderer/extensions/user_script_slave.cc

diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc

index b3657a304b5451338983bf2a1fe5060d3c0d8b9d..cbfdc3f63a34f82c52bd723abcfe56c28029f26e 100644

--- a/chrome/renderer/extensions/user_script_slave.cc

+++ b/chrome/renderer/extensions/user_script_slave.cc

@@ -352,11 +352,13 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,

blink::WebFrame* top_frame = frame->top();

content::RenderView* render_view =

content::RenderView::FromWebView(top_frame->view());

- render_view->Send(new ExtensionHostMsg_ContentScriptsExecuting(

- render_view->GetRoutingID(),

- extensions_executing_scripts,

- render_view->GetPageId(),

- GetDataSourceURLForFrame(top_frame)));

+ if (render_view) {

+ render_view->Send(new ExtensionHostMsg_ContentScriptsExecuting(

+ render_view->GetRoutingID(),

+ extensions_executing_scripts,

+ render_view->GetPageId(),

+ GetDataSourceURLForFrame(top_frame)));

+ }

}

// Log debug info.

« no previous file with comments | « no previous file | content/renderer/render_view_browsertest.cc » ('j') | content/renderer/render_view_browsertest.cc » ('J')