Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

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: Updated patch to latest WebFrame/Frame lifetime changes. Created 6 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
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 e45d490a1373b1ad6994df3176232b45b6784b8c..b8d4dc255f14ff2418325b696ae3d2f3a226fad7 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -350,13 +350,17 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,
// Notify the browser if any extensions are now executing scripts.
if (!extensions_executing_scripts.empty()) {
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 (top_frame) {
dcheng 2014/02/07 16:53:37 top() should really never return 0... if you can w
+ content::RenderView* render_view =
+ content::RenderView::FromWebView(top_frame->view());
+ 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 | components/autofill/content/renderer/page_click_tracker.cc » ('j') | content/renderer/render_view_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698