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 6d5d72d9a1dc37151e8d0cbd54236b0723a46e2a..689f33855a7d1d1951b7552117138a1f8648248f 100644 |
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc |
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
@@ -667,9 +667,8 @@ v8::Local<v8::Context> PepperPluginInstanceImpl::GetMainWorldContext() { |
void PepperPluginInstanceImpl::Delete() { |
is_deleted_ = true; |
- if (render_frame_ && render_frame_->render_view() && |
- render_frame_->render_view()->plugin_find_handler() == this) { |
- render_frame_->render_view()->set_plugin_find_handler(NULL); |
+ if (render_frame_ && render_frame_->plugin_find_handler() == this) { |
+ render_frame_->set_plugin_find_handler(NULL); |
nasko
2016/01/20 21:43:32
nullptr in all new and changed code.
paulmeyer
2016/01/20 22:54:14
Done.
|
} |
// Keep a reference on the stack. See NOTE above. |
@@ -2531,7 +2530,7 @@ void PepperPluginInstanceImpl::SetPluginToHandleFindRequests( |
render_frame_->GetRenderView()->GetMainRenderFrame() == render_frame_; |
if (!is_main_frame) |
return; |
- render_frame_->render_view()->set_plugin_find_handler(this); |
+ render_frame_->set_plugin_find_handler(this); |
} |
void PepperPluginInstanceImpl::NumberOfFindResultsChanged( |