[reland, refactor] - Move textInputInfo() and textInputType() from WebWidget to WebInputMethodContr…

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 9ab3a0a81e75eaf26acc7f379859d0e9140d532b..8624d2e003cc555908d95aac0d8604404d80a387 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -403,8 +403,7 @@ void WebFrameWidgetImpl::setBaseBackgroundColor(WebColor color) {
 
 WebInputMethodControllerImpl*
 WebFrameWidgetImpl::getActiveWebInputMethodController() const {
-  return WebInputMethodControllerImpl::fromFrame(
-      focusedLocalFrameAvailableForIme());
+  return WebInputMethodControllerImpl::fromFrame(focusedLocalFrameInWidget());
 }
 
 void WebFrameWidgetImpl::scheduleAnimation() {
@@ -465,6 +464,7 @@ void WebFrameWidgetImpl::setFocus(bool enable) {
         }
       }
     }
+    m_imeAcceptEvents = true;
   } else {
     LocalFrame* focusedFrame = focusedLocalFrameInWidget();
     if (focusedFrame) {
@@ -516,20 +516,6 @@ WebRange WebFrameWidgetImpl::compositionRange() {
   return PlainTextRange::create(*editable, range);
 }
 
-WebTextInputInfo WebFrameWidgetImpl::textInputInfo() {
-  LocalFrame* focused = focusedLocalFrameInWidget();
-  if (!focused)
-    return WebTextInputInfo();
-  return focused->inputMethodController().textInputInfo();
-}
-
-WebTextInputType WebFrameWidgetImpl::textInputType() {
-  LocalFrame* focused = focusedLocalFrameInWidget();
-  if (!focused)
-    return WebTextInputTypeNone;
-  return focused->inputMethodController().textInputType();
-}
-
 WebColor WebFrameWidgetImpl::backgroundColor() const {
   if (isTransparent())
     return Color::transparent;