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

Unified Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 1123393004: Check if the RenderView is alive before setting the plugin find handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 9178bd1bba71ae6ba8097fdb1028dddb0b78445b..c1ff080e4af75f478e606d5e00d9d4638b77cbad 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -663,7 +663,7 @@ v8::Local<v8::Context> PepperPluginInstanceImpl::GetMainWorldContext() {
void PepperPluginInstanceImpl::Delete() {
is_deleted_ = true;
- if (render_frame_ &&
+ if (render_frame_ && render_frame_->render_view() &&
render_frame_->render_view()->plugin_find_handler() == this) {
render_frame_->render_view()->set_plugin_find_handler(NULL);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698