IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 3dbf57247d50b9bdc051636cb38e5d847f663490..6272285a129f5e967883226332e2d12e03d74b7f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -10,6 +10,7 @@
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "ui/aura/client/aura_constants.h"
@@ -18,6 +19,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/hit_test.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
@@ -93,6 +95,8 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
       is_fullscreen_(false),
       popup_parent_host_view_(NULL),
       is_loading_(false),
+      text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
+      has_composition_text_(false),
       skip_schedule_paint_(false) {
   host_->SetView(this);
   window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
@@ -227,13 +231,20 @@ void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) {
 void RenderWidgetHostViewAura::TextInputStateChanged(
     ui::TextInputType type,
     bool can_compose_inline) {
-  // http://crbug.com/102569
-  NOTIMPLEMENTED();
+  // TODO(kinaba): currently, can_compose_inline is ignored and always treated
+  // as true. We need to support "can_compose_inline=false" for PPAPI plugins
+  // that may want to avoid drawing composition-text by themselves and pass
+  // the responsibility to the browser.
+  if (text_input_type_ != type) {
+    text_input_type_ = type;
+    // TODO(yusukes): Should we call ImeCancelComposition() here?

[James Su, 2011/11/29 04:25:53]

I think the input method implementation should do it when necessary.

[Yusuke Sato, 2011/11/29 09:06:36]

Sure, removed the TODO.

+    GetInputMethod()->OnTextInputTypeChanged(this);
+  }
 }
 
 void RenderWidgetHostViewAura::ImeCancelComposition() {
-  // http://crbug.com/102569
-  NOTIMPLEMENTED();
+  GetInputMethod()->CancelComposition(this);
+  has_composition_text_ = false;
 }
 
 void RenderWidgetHostViewAura::DidUpdateBackingStore(
@@ -268,6 +279,18 @@ void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) {
   tooltip_ = tooltip_text;
 }
 
+void RenderWidgetHostViewAura::SelectionBoundsChanged(
+    const gfx::Rect& start_rect,
+    const gfx::Rect& end_rect) {
+  if (selection_start_rect_ == start_rect && selection_end_rect_ == end_rect)
+    return;
+
+  selection_start_rect_ = start_rect;
+  selection_end_rect_ = end_rect;
+
+  GetInputMethod()->OnCaretBoundsChanged(this);
+}
+
 BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreSkia(host_, size);
@@ -428,6 +451,164 @@ void RenderWidgetHostViewAura::UnlockMouse() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// RenderWidgetHostViewAura, ui::TextInputClient implementation:
+void RenderWidgetHostViewAura::SetCompositionText(
+    const ui::CompositionText& composition) {
+  if (!host_)
+    return;
+
+  // ui::CompositionUnderline should be identical to
+  // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely.
+  COMPILE_ASSERT(sizeof(ui::CompositionUnderline) ==
+                 sizeof(WebKit::WebCompositionUnderline),
+                 ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff);
+
+  // TODO(suzhe): convert both renderer_host and renderer to use
+  // ui::CompositionText.
+  const std::vector<WebKit::WebCompositionUnderline>& underlines =
+      reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>(
+          composition.underlines);
+
+  // TODO(suzhe): due to a bug of webkit, we can't use selection range with
+  // composition string. See: https://bugs.webkit.org/show_bug.cgi?id=37788
+  host_->ImeSetComposition(composition.text, underlines,
+                           composition.selection.end(),
+                           composition.selection.end());
+
+  has_composition_text_ = !composition.text.empty();
+}
+
+void RenderWidgetHostViewAura::ConfirmCompositionText() {
+  if (host_ && has_composition_text_)
+    host_->ImeConfirmComposition();
+  has_composition_text_ = false;
+}
+
+void RenderWidgetHostViewAura::ClearCompositionText() {
+  if (host_ && has_composition_text_)
+    host_->ImeCancelComposition();
+  has_composition_text_ = false;
+}
+
+void RenderWidgetHostViewAura::InsertText(const string16& text) {
+  DCHECK(text_input_type_ != ui::TEXT_INPUT_TYPE_NONE);
+  if (host_)
+    host_->ImeConfirmComposition(text);
+  has_composition_text_ = false;
+}
+
+void RenderWidgetHostViewAura::InsertChar(char16 ch, int flags) {
+  if (host_) {
+    // Send a WebKit::WebInputEvent::Char event to |host_|.
+    NativeWebKeyboardEvent webkit_event(ui::ET_KEY_PRESSED,
+                                        true /* is_char */,
+                                        ch,
+                                        flags,
+                                        base::Time::Now().ToDoubleT());
+    host_->ForwardKeyboardEvent(webkit_event);
+  }
+}
+
+ui::TextInputType RenderWidgetHostViewAura::GetTextInputType() const {
+  return text_input_type_;
+}
+
+gfx::Rect RenderWidgetHostViewAura::GetCaretBounds() {
+  const gfx::Rect rect = selection_start_rect_.Union(selection_end_rect_);
+  gfx::Point origin = rect.origin();
+  gfx::Point end = gfx::Point(rect.right(), rect.bottom());
+
+  aura::Desktop* desktop = aura::Desktop::GetInstance();
+  aura::Window::ConvertPointToWindow(window_, desktop, &origin);
+  aura::Window::ConvertPointToWindow(window_, desktop, &end);
+  // TODO(yusukes): Unlike Chrome OS, |desktop| origin might not be the same as
+  // the system screen origin on Windows and Linux. Probably we should
+  // (implement and) use something like ConvertPointToScreen().
+
+  return gfx::Rect(origin.x(),
+                   origin.y(),
+                   end.x() - origin.x(),
+                   end.y() - origin.y());
+}
+
+bool RenderWidgetHostViewAura::HasCompositionText() {
+  return has_composition_text_;
+}
+
+bool RenderWidgetHostViewAura::GetTextRange(ui::Range* range) {
+  range->set_start(selection_text_offset_);
+  range->set_end(selection_text_offset_ + selection_text_.length());
+  return true;
+}
+
+bool RenderWidgetHostViewAura::GetCompositionTextRange(ui::Range* range) {
+  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool RenderWidgetHostViewAura::GetSelectionRange(ui::Range* range) {
+  range->set_start(selection_range_.start());
+  range->set_end(selection_range_.end());
+  return true;
+}
+
+bool RenderWidgetHostViewAura::SetSelectionRange(const ui::Range& range) {
+  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool RenderWidgetHostViewAura::DeleteRange(const ui::Range& range) {
+  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool RenderWidgetHostViewAura::GetTextFromRange(
+    const ui::Range& range,
+    string16* text) {
+  ui::Range selection_text_range(selection_text_offset_,
+      selection_text_offset_ + selection_text_.length());
+
+  if (!selection_text_range.Contains(range)) {
+    text->clear();
+    return false;
+  }
+  if (selection_text_range.EqualsIgnoringDirection(range)) {
+    // Avoid calling substr whose performance is low.
+    *text = selection_text_;
+  } else {
+    *text = selection_text_.substr(
+        range.GetMin() - selection_text_offset_,
+        range.length());
+  }
+  return true;
+}
+
+void RenderWidgetHostViewAura::OnInputMethodChanged() {
+  if (!host_)
+    return;
+
+  host_->SetInputMethodActive(GetInputMethod()->IsActive());
+
+  // TODO(suzhe): implement the newly added “locale” property of HTML DOM
+  // TextEvent.
+}
+
+bool RenderWidgetHostViewAura::ChangeTextDirectionAndLayoutAlignment(
+      base::i18n::TextDirection direction) {
+  if (!host_)
+    return false;
+  host_->UpdateTextDirection(
+      direction == base::i18n::RIGHT_TO_LEFT ?
+      WebKit::WebTextDirectionRightToLeft :
+      WebKit::WebTextDirectionLeftToRight);
+  host_->NotifyTextDirection();
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, aura::WindowDelegate implementation:
 
 gfx::Size RenderWidgetHostViewAura::GetMinimumSize() const {
@@ -442,10 +623,26 @@ void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
 
 void RenderWidgetHostViewAura::OnFocus() {
   host_->GotFocus();
+
+  ui::InputMethod* input_method = GetInputMethod();
+  // Ask the system-wide IME to send all TextInputClient messages to |this|
+  // object.
+  input_method->SetFocusedTextInputClient(this);
+  // TODO(yusukes): Should we call ImeCancelComposition() here? Or, can we

[Yusuke Sato, 2011/11/29 09:06:36]

Removed L631-632 (the TODO).

+  // remove the OnTextInputTypeChanged() call below?
+  input_method->OnTextInputTypeChanged(this);

[James Su, 2011/11/29 04:25:53]

This should be called automatically. So we don't need to call
ImeCancelComposition() either.

[Yusuke Sato, 2011/11/29 09:06:36]

Let me keep the input_method->OnTextInputTypeChanged(this); call. Here is the
reason why:

On 2011/11/29 04:25:53, James Su wrote:
I tried to remove L.633 but it didn't work well. It turned out that
RWHVA::TextInputStateChanged() is not always called when RWHVA gets focused.

For example, in the following scenario, the IME candidate window remains after
step 6.

1. Switch to Pinyin IME
2. navigate to www.google.com
3. click the search box
4. click Omnibox
5. show the candidate window by typing some Chinese text
6. before commiting the text, click the search box again

Expected:
The composition text is committed to Omnibox, and the candidate window is
hidden.

Actual:
The composition text is committed to Omnibox, but the candidate window is still
shown.

This is likely because RenderWidget::UpdateTextInputState() does not call
RWHVA's TextInputStateChanged() method when old and new text_input_type matches.
Furthermore, RWHVA::TextInputStateChanged() also has the same logic like 'if
(text_input_type_ != type) { ...'.

[James Su, 2011/11/30 01:39:23]

Then I think ui::InputMethod::SetFocusedTextInputClient() should do the trick,
just like what we've done in views::InputMethodXXX::OnWillChangeFocus() and
OnDidChangeFocus().

[Yusuke Sato, 2011/11/30 02:25:49]

sure, removed input_method->OnTextInputTypeChanged(this); from RWHVA and added
some code to ui::InputMethodBase::SetFocusedTextInputClient(). Please take
another look.

On 2011/11/30 01:39:23, James Su wrote:

+
+  host_->SetInputMethodActive(input_method->IsActive());
+  // TODO(yusukes): Support TextInputTypeTracker for TOUCH_UI.

[James Su, 2011/11/29 04:25:53]

Shouldn't it be added into ui::InputMethodBase?

[Yusuke Sato, 2011/11/29 09:06:36]

Correct. Removed.

 }
 
 void RenderWidgetHostViewAura::OnBlur() {
   host_->Blur();
+
+  ui::InputMethod* input_method = GetInputMethod();
+  if (input_method->GetTextInputClient() == this)
+    input_method->SetFocusedTextInputClient(NULL);
+  host_->SetInputMethodActive(false);
 }
 
 bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) {
@@ -453,8 +650,23 @@ bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) {
   if (is_fullscreen_ && event->key_code() == ui::VKEY_ESCAPE) {
     host_->Shutdown();
   } else {
-    NativeWebKeyboardEvent webkit_event(event);
-    host_->ForwardKeyboardEvent(webkit_event);
+    // We don't have to communicate with an input method here. It has already
+    // been done by aura/desktop_host_<platform>.cc.
+#if defined(USE_X11)
+    if (!event->native_event()) {
+      // Send a fabricated event, which is usually a VKEY_PROCESSKEY IME event.
+      NativeWebKeyboardEvent webkit_event(event->type(),
+                                          false /* is_char */,
+                                          event->GetCharacter(),
+                                          event->flags(),
+                                          base::Time::Now().ToDoubleT());
+      host_->ForwardKeyboardEvent(webkit_event);
+    } else
+#endif
+    {
+      NativeWebKeyboardEvent webkit_event(event);
+      host_->ForwardKeyboardEvent(webkit_event);
+    }
   }
   return true;
 }
@@ -474,6 +686,8 @@ bool RenderWidgetHostViewAura::OnMouseEvent(aura::MouseEvent* event) {
   else if (CanRendererHandleEvent(event->native_event()))
     host_->ForwardMouseEvent(content::MakeWebMouseEvent(event));
 
+  // TODO(yusukes): Confirm existing composition text on mouse click events.
+
   // Return true so that we receive released/drag events.
   return true;
 }
@@ -577,3 +791,8 @@ void RenderWidgetHostView::GetDefaultScreenInfo(
   results->depth = 24;
   results->depthPerComponent = 8;
 }
+
+ui::InputMethod* RenderWidgetHostViewAura::GetInputMethod() {
+  aura::Desktop* desktop = aura::Desktop::GetInstance();
+  return desktop->GetInputMethod();
+}