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

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

Issue 250063003: Pepper: Move IME workaround from the trusted plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile error Created 6 years, 8 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 d79c9f96630f73cfa6955beb71b592498802292d..a951355d10bca87b7fa04549c13209392ffb5886 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -1248,6 +1248,11 @@ void PepperPluginInstanceImpl::SetLinkUnderCursor(const std::string& url) {
link_under_cursor_ = base::UTF8ToUTF16(url);
}
+void PepperPluginInstanceImpl::SetTextInputType(ui::TextInputType type) {
+ text_input_type_ = type;
+ render_frame_->PepperTextInputTypeChanged(this);
+}
+
base::string16 PepperPluginInstanceImpl::GetSelectedText(bool html) {
// Keep a reference on the stack. See NOTE above.
scoped_refptr<PepperPluginInstanceImpl> ref(this);
@@ -2600,8 +2605,7 @@ void PepperPluginInstanceImpl::SetTextInputType(PP_Instance instance,
int itype = type;
if (itype < 0 || itype > ui::TEXT_INPUT_TYPE_URL)
itype = ui::TEXT_INPUT_TYPE_NONE;
- text_input_type_ = static_cast<ui::TextInputType>(itype);
- render_frame_->PepperTextInputTypeChanged(this);
+ SetTextInputType(static_cast<ui::TextInputType>(itype));
}
void PepperPluginInstanceImpl::UpdateCaretPosition(
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.h ('k') | ppapi/native_client/src/trusted/plugin/plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698