Revert 201479 "Make InputMethodWin TSF-aware."

trunk/src/ui/views/ime/input_method_win.cc

 // Copyright (c) 2012 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 "ui/views/ime/input_method_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "base/win/metro.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/ime/win/tsf_bridge.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/win/hwnd_util.h"
-#include "ui/views/win/hwnd_util.h"
 
 // Extra number of chars before and after selection (or composition) range which
 // is returned to IME for improving conversion accuracy.
 static const size_t kExtraNumberOfChars = 20;
 
 namespace views {
 
 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate,
                                HWND hwnd,
                                ui::InputMethod* host)
@@ skipping 11 matching lines @@
 }
 
 void InputMethodWin::Init(Widget* widget) {
   InputMethodBase::Init(widget);
 
   // Gets the initial input locale and text direction information.
   OnInputLangChange(0, 0);
 }
 
 void InputMethodWin::OnFocus() {
-  if (base::win::IsTSFAwareRequired()) {
-    if (GetTextInputClient()) {
-      ui::TSFBridge* tsf_bridge = ui::TSFBridge::GetInstance();
-      tsf_bridge->SetFocusedClient(hwnd_, GetTextInputClient());
-    }
-  } else {
-    // Use switch here in case we are going to add more text input types.
-    // We disable input method in password field.
-    switch (GetTextInputType()) {
-      case ui::TEXT_INPUT_TYPE_NONE:
-      case ui::TEXT_INPUT_TYPE_PASSWORD:
-        ime_input_.DisableIME(hwnd_);
-        break;
-      default:
-        ime_input_.EnableIME(hwnd_);
-      break;
-    }
-    OnTextInputTypeChanged(GetFocusedView());
-    OnCaretBoundsChanged(GetFocusedView());
-  }
+  UpdateIMEState();
 }
 
 void InputMethodWin::OnBlur() {
   ConfirmCompositionText();
-  if (base::win::IsTSFAwareRequired() && GetTextInputClient())
-    ui::TSFBridge::GetInstance()->RemoveFocusedClient(GetTextInputClient());
 }
 
 void InputMethodWin::DispatchKeyEvent(const ui::KeyEvent& key) {
   // Handles ctrl-shift key to change text direction and layout alignment.
   if (ui::ImeInput::IsRTLKeyboardLayoutInstalled() && !IsTextInputTypeNone()) {
     ui::KeyboardCode code = key.key_code();
     if (key.type() == ui::ET_KEY_PRESSED) {
       if (code == ui::VKEY_SHIFT) {
         base::i18n::TextDirection dir;
         if (ui::ImeInput::IsCtrlShiftPressed(&dir))
           pending_requested_direction_ = dir;
       } else if (code != ui::VKEY_CONTROL) {
         pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION;
       }
     } else if (key.type() == ui::ET_KEY_RELEASED &&
                (code == ui::VKEY_SHIFT || code == ui::VKEY_CONTROL) &&
                pending_requested_direction_ != base::i18n::UNKNOWN_DIRECTION) {
       GetTextInputClient()->ChangeTextDirectionAndLayoutAlignment(
           pending_requested_direction_);
       pending_requested_direction_ = base::i18n::UNKNOWN_DIRECTION;
     }
   }
 
   DispatchKeyEventPostIME(key);
 }
 
 void InputMethodWin::OnTextInputTypeChanged(View* view) {
   if (IsViewFocused(view)) {
-    if (base::win::IsTSFAwareRequired()) {
-      if (GetTextInputClient()) {
-        ui::TSFBridge::GetInstance()->OnTextInputTypeChanged(
-            GetTextInputClient());
-      }
-    } else {
-      ime_input_.CancelIME(hwnd_);
-      // Use switch here in case we are going to add more text input types.
-      // We disable input method in password field.
-      switch (GetTextInputType()) {
-        case ui::TEXT_INPUT_TYPE_NONE:
-        case ui::TEXT_INPUT_TYPE_PASSWORD:
-          ime_input_.DisableIME(hwnd_);
-          break;
-        default:
-          ime_input_.EnableIME(hwnd_);
-          break;
-      }
-      OnCaretBoundsChanged(GetFocusedView());
-    }
+    ime_input_.CancelIME(hwnd_);
+    UpdateIMEState();
   }
   InputMethodBase::OnTextInputTypeChanged(view);
 }
 
 void InputMethodWin::OnCaretBoundsChanged(View* view) {
-  if (base::win::IsTSFAwareRequired()) {
-    ui::TSFBridge::GetInstance()->OnTextLayoutChanged();
-  } else {
-    gfx::Rect rect;
-    if (!IsViewFocused(view) || !GetCaretBoundsInWidget(&rect))
-      return;
-    ime_input_.UpdateCaretRect(hwnd_, rect);
-  }
+  gfx::Rect rect;
+  if (!IsViewFocused(view) || !GetCaretBoundsInWidget(&rect))
+    return;
+  ime_input_.UpdateCaretRect(hwnd_, rect);
 }
 
 void InputMethodWin::CancelComposition(View* view) {
-  if (IsViewFocused(view)) {
-    if (base::win::IsTSFAwareRequired()) {
-      ui::TSFBridge::GetInstance()->CancelComposition();
-    } else {
-      ime_input_.CancelIME(hwnd_);
-    }
-  }
+  if (IsViewFocused(view))
+    ime_input_.CancelIME(hwnd_);
 }
 
 std::string InputMethodWin::GetInputLocale() {
   return locale_;
 }
 
 base::i18n::TextDirection InputMethodWin::GetInputTextDirection() {
   return direction_;
 }
 
@@ skipping 41 matching lines @@
       break;
   }
   return result;
 }
 
 void InputMethodWin::OnWillChangeFocus(View* focused_before, View* focused) {
   ConfirmCompositionText();
 }
 
 void InputMethodWin::OnDidChangeFocus(View* focused_before, View* focused) {
-  if (base::win::IsTSFAwareRequired()) {
-    if (GetTextInputClient()) {
-      ui::TSFBridge::GetInstance()->SetFocusedClient(HWNDForView(focused),
-                                                     GetTextInputClient());
-    }
-  } else {
-    // Use switch here in case we are going to add more text input types.
-    // We disable input method in password field.
-    switch (GetTextInputType()) {
-      case ui::TEXT_INPUT_TYPE_NONE:
-      case ui::TEXT_INPUT_TYPE_PASSWORD:
-        ime_input_.DisableIME(hwnd_);
-        break;
-      default:
-        ime_input_.EnableIME(hwnd_);
-        break;
-    }
-    OnTextInputTypeChanged(GetFocusedView());
-    OnCaretBoundsChanged(GetFocusedView());
-  }
+  UpdateIMEState();
 }
 
 void InputMethodWin::OnInputLangChange(DWORD character_set,
                                        HKL input_language_id) {
   active_ = ime_input_.SetInputLanguage();
   locale_ = ime_input_.GetInputLanguageName();
   direction_ = ime_input_.GetTextDirection();
   OnInputMethodChanged();
 }
 
@@ skipping 102 matching lines @@
 
   // We need to send character events to the focused text input client event if
   // its text input type is ui::TEXT_INPUT_TYPE_NONE.
   if (GetTextInputClient()) {
     GetTextInputClient()->InsertChar(static_cast<char16>(wparam),
                                      ui::GetModifiersFromKeyState());
   }
 
   // Explicitly show the system menu at a good location on [Alt]+[Space].
   // Note: Setting |handled| to FALSE for DefWindowProc triggering of the system
-  //       menu causes undesirable titlebar artifacts in the classic theme.
+  //       menu causes unsdesirable titlebar artifacts in the classic theme.
   if (message == WM_SYSCHAR && wparam == VK_SPACE)
     ui::ShowSystemMenu(hwnd_);
 
   return 0;
 }
 
 LRESULT InputMethodWin::OnDeadChar(
     UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled) {
   *handled = TRUE;
 
@@ skipping 64 matching lines @@
   reconv->dwCompStrLen =
       client->HasCompositionText() ? target_range.length() : 0;
   reconv->dwCompStrOffset =
       (target_range.GetMin() - text_range.start()) * sizeof(WCHAR);
   reconv->dwTargetStrLen = target_range.length();
   reconv->dwTargetStrOffset = reconv->dwCompStrOffset;
 
   memcpy((char*)reconv + sizeof(RECONVERTSTRING),
          text.c_str(), len * sizeof(WCHAR));
 
-  // According to Microsoft API document, IMR_RECONVERTSTRING and
+  // According to Microsft API document, IMR_RECONVERTSTRING and
   // IMR_DOCUMENTFEED should return reconv, but some applications return
   // need_size.
   return reinterpret_cast<LRESULT>(reconv);
 }
 
 LRESULT InputMethodWin::OnReconvertString(RECONVERTSTRING* reconv) {
   ui::TextInputClient* client = GetTextInputClient();
   if (!client)
     return 0;
 
@@ skipping 62 matching lines @@
     return 0;
 
   char_positon->pt.x = rect.x();
   char_positon->pt.y = rect.y();
   char_positon->cLineHeight = rect.height();
   return 1;  // returns non-zero value when succeeded.
 }
 
 void InputMethodWin::ConfirmCompositionText() {
   if (!IsTextInputTypeNone()) {
-    if (base::win::IsTSFAwareRequired()) {
-      // TSFBridge has not implemented ConfirmComposition yet. So here cancel
-      // the composition instead as a workaround.
-      // TODO(ime): Implement ConfirmComposition for TSF.
-      ui::TSFBridge::GetInstance()->CancelComposition();
-    } else {
-      ime_input_.CleanupComposition(hwnd_);
-      // Though above line should confirm the client's composition text by
-      // sending a result text to us, in case the input method and the client
-      // are in inconsistent states, we check the client's composition state
-      // again.
-      if (GetTextInputClient()->HasCompositionText())
-        GetTextInputClient()->ConfirmCompositionText();
-    }
+    ime_input_.CleanupComposition(hwnd_);
+    // Though above line should confirm the client's composition text by sending
+    // a result text to us, in case the input method and the client are in
+    // inconsistent states, we check the client's composition state again.
+    if (GetTextInputClient()->HasCompositionText())
+      GetTextInputClient()->ConfirmCompositionText();
+  }
+}
+
+void InputMethodWin::UpdateIMEState() {
+  // Use switch here in case we are going to add more text input types.
+  // We disable input method in password field.
+  switch (GetTextInputType()) {
+    case ui::TEXT_INPUT_TYPE_NONE:
+    case ui::TEXT_INPUT_TYPE_PASSWORD:
+      ime_input_.DisableIME(hwnd_);
+      break;
+    default:
+      ime_input_.EnableIME(hwnd_);
+      break;
   }
 }
 
 }  // namespace views