Introduce WebInputMethodController to blink

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 bd1c408ef78183ba0e384f12d304a277ce1b9e0a..1b24dbede1030b9eaed8882fb68aaebbc67ab3ac 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -64,6 +64,7 @@
 #include "web/ContextMenuAllowedScope.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
+#include "web/WebInputMethodControllerImpl.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
@@ -407,6 +408,11 @@ void WebFrameWidgetImpl::setBaseBackgroundColor(WebColor color)
     m_localRoot->frameView()->setBaseBackgroundColor(color);
 }
 
+WebInputMethodControllerImpl* WebFrameWidgetImpl::getActiveWebInputMethodController() const
+{
+    return WebInputMethodControllerImpl::fromFrame(focusedLocalFrameAvailableForIme());
+}
+
 void WebFrameWidgetImpl::scheduleAnimation()
 {
     if (m_layerTreeView) {
@@ -500,82 +506,27 @@ bool WebFrameWidgetImpl::setComposition(
     int selectionStart,
     int selectionEnd)
 {
-    LocalFrame* focused = focusedLocalFrameAvailableForIme();
-    if (!focused)
-        return false;
-
-    if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->setComposition(text, underlines, selectionStart, selectionEnd);
-
-    // The input focus has been moved to another WebWidget object.
-    // We should use this |editor| object only to complete the ongoing
-    // composition.
-    InputMethodController& inputMethodController = focused->inputMethodController();
-    if (!focused->editor().canEdit() && !inputMethodController.hasComposition())
+    if (!getActiveWebInputMethodController())
         return false;
-
-    // We should verify the parent node of this IME composition node are
-    // editable because JavaScript may delete a parent node of the composition
-    // node. In this case, WebKit crashes while deleting texts from the parent
-    // node, which doesn't exist any longer.
-    const EphemeralRange range = inputMethodController.compositionEphemeralRange();
-    if (range.isNotNull()) {
-        Node* node = range.startPosition().computeContainerNode();
-        focused->document()->updateStyleAndLayoutTree();
-        if (!node || !hasEditableStyle(*node))
-            return false;
-    }
-
-    // A keypress event is canceled. If an ongoing composition exists, then the
-    // keydown event should have arisen from a handled key (e.g., backspace).
-    // In this case we ignore the cancellation and continue; otherwise (no
-    // ongoing composition) we exit and signal success only for attempts to
-    // clear the composition.
-    if (m_suppressNextKeypressEvent && !inputMethodController.hasComposition())
-        return text.isEmpty();
-
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-
-    // When the range of composition underlines overlap with the range between
-    // selectionStart and selectionEnd, WebKit somehow won't paint the selection
-    // at all (see InlineTextBox::paint() function in InlineTextBox.cpp).
-    // But the selection range actually takes effect.
-    inputMethodController.setComposition(String(text),
-        CompositionUnderlineVectorBuilder(underlines),
-        selectionStart, selectionEnd);
-
-    return text.isEmpty() || inputMethodController.hasComposition();
+    return getActiveWebInputMethodController()->setComposition(text, underlines, selectionStart, selectionEnd);
 }
 
 // TODO(ekaramad):These methods are almost duplicated in WebViewImpl as well.
 // This code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::commitText(const WebString& text, int relativeCaretPosition)
 {
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    LocalFrame* focused = focusedLocalFrameAvailableForIme();
-    if (!focused)
+    if (!getActiveWebInputMethodController())
         return false;
-
-    if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->commitText(text, relativeCaretPosition);
-
-    return focused->inputMethodController().commitText(text, relativeCaretPosition);
+    return getActiveWebInputMethodController()->commitText(text, relativeCaretPosition);
 }
 
+// TODO(ekaramad):These methods are almost duplicated in WebViewImpl as well.
+// This code needs to be refactored  (http://crbug.com/629721).
 bool WebFrameWidgetImpl::finishComposingText(ConfirmCompositionBehavior selectionBehavior)
 {
-    LocalFrame* focused = focusedLocalFrameAvailableForIme();
-    if (!focused)
+    if (!getActiveWebInputMethodController())
         return false;
-
-    if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->finishComposingText(selectionBehavior);
-
-    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
-    // needs to be audited.  See http://crbug.com/590369 for more details.
-    focused->document()->updateStyleAndLayoutIgnorePendingStylesheets();
-
-    return focused->inputMethodController().finishComposingText(selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
+    return getActiveWebInputMethodController()->finishComposingText(selectionBehavior);
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebViewImpl as well. This