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

content/renderer/render_widget.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_widget.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 40 matching lines @@
 using WebKit::WebMouseEvent;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPopupMenu;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebPopupType;
 using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebSize;
 using WebKit::WebTextDirection;
-using WebKit::WebTextInputType;
 using WebKit::WebVector;
 using WebKit::WebWidget;
 
 RenderWidget::RenderWidget(RenderThreadBase* render_thread,
                            WebKit::WebPopupType popup_type)
     : routing_id_(MSG_ROUTING_NONE),
       webwidget_(NULL),
       opener_id_(MSG_ROUTING_NONE),
       render_thread_(render_thread),
       host_window_(0),
       current_paint_buf_(NULL),
       next_paint_flags_(0),
       filtered_time_per_frame_(1.0f/60.0f),
       update_reply_pending_(false),
       using_asynchronous_swapbuffers_(false),
       num_swapbuffers_complete_pending_(0),
       did_show_(false),
       is_hidden_(false),
       needs_repainting_on_restore_(false),
       has_focus_(false),
       handling_input_event_(false),
       closing_(false),
       is_swapped_out_(false),
       input_method_is_active_(false),
-      text_input_type_(WebKit::WebTextInputTypeNone),
+      text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
+      can_compose_inline_(true),
       popup_type_(popup_type),
       pending_window_rect_count_(0),
       suppress_next_char_events_(false),
       is_accelerated_compositing_active_(false),
       animation_update_pending_(false),
       animation_task_posted_(false),
       invalidation_task_posted_(false) {
   RenderProcess::current()->AddRefProcess();
   DCHECK(render_thread_);
   has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 1174 matching lines @@
 }
 
 void RenderWidget::set_next_paint_is_repaint_ack() {
   next_paint_flags_ |= ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK;
 }
 
 void RenderWidget::UpdateInputMethod() {
   if (!input_method_is_active_)
     return;
 
-  WebTextInputType new_type = GetTextInputType();
+  ui::TextInputType new_type = GetTextInputType();
+  bool new_can_compose_inline = CanComposeInline();
   WebRect new_caret_bounds;
 
   if (webwidget_)
    new_caret_bounds = webwidget_->caretOrSelectionBounds();
 
   // Only sends text input type and caret bounds to the browser process if they
   // are changed.
-  if (text_input_type_ != new_type || caret_bounds_ != new_caret_bounds) {
+  if (text_input_type_ != new_type || caret_bounds_ != new_caret_bounds ||
+      can_compose_inline_ != new_can_compose_inline) {
     text_input_type_ = new_type;
+    can_compose_inline_ = new_can_compose_inline;
     caret_bounds_ = new_caret_bounds;
     Send(new ViewHostMsg_ImeUpdateTextInputState(
-        routing_id(), new_type, new_caret_bounds));
+        routing_id(), new_type, new_can_compose_inline, new_caret_bounds));
   }
 }
 
-WebKit::WebTextInputType RenderWidget::GetTextInputType() {
+ui::TextInputType RenderWidget::GetTextInputType() {
   if (webwidget_)
-    return webwidget_->textInputType();
-  return WebKit::WebTextInputTypeNone;
+    return static_cast<ui::TextInputType>(webwidget_->textInputType());
+  return ui::TEXT_INPUT_TYPE_NONE;
+}
+
+bool RenderWidget::CanComposeInline() {
+  return true;
 }
 
 WebScreenInfo RenderWidget::screenInfo() {
   WebScreenInfo results;
   Send(new ViewHostMsg_GetScreenInfo(routing_id_, host_window_, &results));
   return results;
 }
 
 void RenderWidget::resetInputMethod() {
   if (!input_method_is_active_)
     return;
 
   // If the last text input type is not None, then we should finish any
   // ongoing composition regardless of the new text input type.
-  if (text_input_type_ != WebKit::WebTextInputTypeNone) {
+  if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE) {
     // If a composition text exists, then we need to let the browser process
     // to cancel the input method's ongoing composition session.
     if (webwidget_->confirmComposition())
       Send(new ViewHostMsg_ImeCancelComposition(routing_id()));
   }
 
   // Send an updated IME range with the current caret rect.
   ui::Range range(ui::Range::InvalidRange());
   size_t location, length;
   if (webwidget_->caretOrSelectionRange(&location, &length)) {
@@ skipping 23 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }