Show composition text on IME panel when Pepper plugin is focused (Linux).

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 3959 matching lines @@
       char_event.text[0] = text[i];
       char_event.unmodifiedText[0] = text[i];
       if (webwidget_)
         webwidget_->handleInputEvent(char_event);
     }
   } else {
     RenderWidget::OnImeConfirmComposition(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;
+    return ui::TEXT_INPUT_TYPE_TEXT;
   } else {
     return RenderWidget::GetTextInputType();
   }
 }
 
+bool RenderView::CanComposeInline() {
+  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 false;
+  } else {

[brettw, 2011/06/13 14:52:36]

Normally we prefer no "else" after a return statement, so you can just remove
the else (I realize you probably just copied the code above).

[kinaba, 2011/06/13 17:48:16]

Done.

+    return true;
+  }
+}
+
 #if defined(OS_MACOSX)
 void RenderView::PluginFocusChanged(bool focused, int plugin_id) {
   IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(),
                                                          focused, plugin_id);
   Send(msg);
 }
 
 void RenderView::StartPluginIme() {
   IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id());
   // This message can be sent during event-handling, and needs to be delivered
@@ skipping 242 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }