Remove the 2-level input method system & InputMethodBridge.

ui/views/cocoa/bridged_native_widget.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/thread_task_runner_handle.h"
 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/gfx/mac/nswindow_frame_controls.h"
 #include "ui/gfx/screen.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/cocoa_mouse_capture.h"
 #include "ui/views/cocoa/tooltip_manager_mac.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #import "ui/views/cocoa/widget_owner_nswindow_adapter.h"
-#include "ui/views/ime/input_method_bridge.h"
-#include "ui/views/ime/null_input_method.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_aura_utils.h"
 #include "ui/views/widget/widget_delegate.h"
 
 // The NSView that hosts the composited CALayer drawing the UI. It fills the
 // window but is not hittable so that accessibility hit tests always go to the
 // BridgedContentView.
@@ skipping 660 matching lines @@
   bool shows_resize_controls =
       is_resizable && (min_size.IsEmpty() || min_size != max_size);
   bool shows_fullscreen_controls =
       is_resizable && widget->widget_delegate()->CanMaximize();
 
   gfx::ApplyNSWindowSizeConstraints(window_, min_size, max_size,
                                     shows_resize_controls,
                                     shows_fullscreen_controls);
 }
 
-InputMethod* BridgedNativeWidget::CreateInputMethod() {
-  return new InputMethodBridge(this, GetHostInputMethod(), true);
-}
-
-ui::InputMethod* BridgedNativeWidget::GetHostInputMethod() {
+ui::InputMethod* BridgedNativeWidget::GetInputMethod() {
   if (!input_method_) {
-    // Delegate is NULL because Mac IME does not need DispatchKeyEventPostIME
-    // callbacks.
-    input_method_ = ui::CreateInputMethod(NULL, nil);
+    input_method_ = ui::CreateInputMethod(this, nil);
+    input_method_->OnFocus();

[tapted, 2015/06/29 04:57:21]

Can you add a comment about this line?

It seems out of place.. e.g. things like Textfield::SetReadOnly(..) call into
this, and the widget might not have focus then. I patched this in, and I see
text input breaks without this line.

The problem seems to be that the new version of
BridgedNativeWidget::OnDidChangeFocus(..) below will get a null TextInputClient
from InputMethodBase::GetTextInputClient()  (i.e. because
InputMethodBase::system_toplevel_window_focused_ is not yet set)

Is the problem that the Mac implementation is currently missing a call to
input_method_->OnFocus() when the widget gains focus? Is there a data race
somewhere? Do we need a different way to get the TextInputClient? (or perhaps
OnFocus really is the right thing to do -- I'm still wrapping my head around the
IME stuff :).

[Shu Chen, 2015/06/29 06:05:57]

ui::InputMethod::OnBlur() only gets called in DesktopNativeWidgetAura.
And for Mac, InputMethod::OnBlur() is never called.

So the OnFocus() call here is to make sure the InputMethod under Mac is "always
focused".
ChromeOS/Ash also uses such "always focused" mode.
Please refer to DisplayController::AddWindowTreeHostForDisplay().

[tapted, 2015/06/29 06:34:48]

Acknowledged. (we discussed this out of band - "always focused" mode is fine to
keep things simple for now. I'm going to follow-up to resolve the TODO with some
test coverage)

   }
   return input_method_.get();
 }
 
 gfx::Rect BridgedNativeWidget::GetRestoredBounds() const {
   if (target_fullscreen_state_ || in_fullscreen_transition_)
     return bounds_before_fullscreen_;
 
   return gfx::ScreenRectFromNSRect([window_ frame]);
 }
@@ skipping 21 matching lines @@
     [window_ setOpaque:NO];
     [window_ setBackgroundColor:[NSColor clearColor]];
   }
 
   UpdateLayerProperties();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, internal::InputMethodDelegate:
 
-void BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
+bool BridgedNativeWidget::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
   DCHECK(focus_manager_);
   native_widget_mac_->GetWidget()->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
   if (!key.handled())
     focus_manager_->OnKeyEvent(key);

[tapted, 2015/06/29 04:57:21]

BridgedContentView currently ignores the return value, but this should probably
be 

  return !focus_manager_->OnKeyEvent(key);

[Shu Chen, 2015/06/29 06:05:57]

Done.

+  return key.handled();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, CocoaMouseCaptureDelegate:
 
 void BridgedNativeWidget::PostCapturedEvent(NSEvent* event) {
   [bridged_view_ processCapturedMouseEvent:event];
 }
 
 void BridgedNativeWidget::OnMouseCaptureLost() {
   native_widget_mac_->GetWidget()->OnMouseCaptureLost();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, FocusChangeListener:
 
 void BridgedNativeWidget::OnWillChangeFocus(View* focused_before,
                                             View* focused_now) {
 }
 
 void BridgedNativeWidget::OnDidChangeFocus(View* focused_before,
                                            View* focused_now) {
-  ui::TextInputClient* input_client =
-      focused_now ? focused_now->GetTextInputClient() : NULL;
-  [bridged_view_ setTextInputClient:input_client];
+  ui::InputMethod* input_method =
+      native_widget_mac_->GetWidget()->GetInputMethod();
+  if (input_method) {
+    ui::TextInputClient* input_client = input_method->GetTextInputClient();
+    [bridged_view_ setTextInputClient:input_client];
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BridgedNativeWidget, LayerDelegate:
 
 void BridgedNativeWidget::OnPaintLayer(const ui::PaintContext& context) {
   DCHECK(window_visible_);
   native_widget_mac_->GetWidget()->OnNativeWidgetPaint(context);
 }
 
@@ skipping 225 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views