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

Unified Diff: content/renderer/render_view.cc

Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A todo comment is reworded to be more correct. Created 9 years, 6 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 | « content/renderer/render_view.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 0d1e8e06135343697d8d0c522435b7a83ab9063f..30c47f58ebcc654c9b29b5dbfa3a317d49d5e376 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -3977,14 +3977,24 @@ void RenderView::OnImeConfirmComposition(const string16& text) {
}
}
-WebKit::WebTextInputType RenderView::GetTextInputType() {
+ui::TextInputType RenderView::GetTextInputType() {
if (pepper_delegate_.IsPluginFocused()) {
// TODO(kinaba) Until PPAPI has an interface for handling IME events, we
// consider all the parts of PPAPI plugins are accepting text inputs.
- return WebKit::WebTextInputTypeText;
- } else {
- return RenderWidget::GetTextInputType();
+ return ui::TEXT_INPUT_TYPE_TEXT;
}
+ return RenderWidget::GetTextInputType();
+}
+
+bool RenderView::CanComposeInline() {
+ if (pepper_delegate_.IsPluginFocused()) {
+ // TODO(kinaba) Until PPAPI has an interface for handling IME events, there
+ // is no way for the browser to know whether the plugin is capable of
+ // drawing composition text. We assume plugins are incapable and let the
+ // browser handle composition display for now.
+ return false;
+ }
+ return true;
}
#if defined(OS_MACOSX)
« no previous file with comments | « content/renderer/render_view.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698