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

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

Issue 1600953003: Move find-in-page code from RenderView to RenderFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments by nasko@, git cl format. Created 4 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: 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..e1e3f988e026b7b57dbe8bd4ab76ec264cfa1d0d 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(nullptr);
}
// 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(

Powered by Google App Engine
This is Rietveld 408576698