Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2282 matching lines @@
             if (focusedFrame->inputMethodController().hasComposition()) {
                 WebAutofillClient* autofillClient = WebLocalFrameImpl::fromFrame(focusedFrame)->autofillClient();
 
                 if (autofillClient)
                     autofillClient->setIgnoreTextChanges(true);
 
                 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
                 // needs to be audited.  See http://crbug.com/590369 for more details.
                 focusedFrame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-                focusedFrame->inputMethodController().confirmComposition();
+                focusedFrame->inputMethodController().finishComposingText(InputMethodController::KeepSelection);
 
                 if (autofillClient)
                     autofillClient->setIgnoreTextChanges(false);
             }
             m_imeAcceptEvents = false;
         }
     }
 }
 
 bool WebViewImpl::setComposition(
@@ skipping 42 matching lines @@
     // 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();
 }
 
-bool WebViewImpl::confirmComposition()
-{
-    return confirmComposition(DoNotKeepSelection);
-}
-
-bool WebViewImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
-{
-    return confirmComposition(WebString(), selectionBehavior);
-}
-
-bool WebViewImpl::confirmComposition(const WebString& text)
-{
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    return confirmComposition(text, DoNotKeepSelection);
-}
-
-bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior)
+bool WebViewImpl::finishComposingText(ConfirmCompositionBehavior selectionBehavior)
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return false;
 
     if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->confirmComposition(text, selectionBehavior);
+        return plugin->finishComposingText(selectionBehavior);
+
+    return focused->inputMethodController().finishComposingText(selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
+}
+
+bool WebViewImpl::commitText(const WebString& text, int relativeCaretPosition)
+{
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
+
+    LocalFrame* focused = focusedLocalFrameAvailableForIme();
+    if (!focused)
+        return false;
+
+    if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
+        return plugin->commitText(text, relativeCaretPosition);
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     focused->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
+    return focused->inputMethodController().commitText(text, relativeCaretPosition);
 }
 
 WebRange WebViewImpl::compositionRange()
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return WebRange();
 
     const EphemeralRange range = focused->inputMethodController().compositionEphemeralRange();
     if (range.isNull())
@@ skipping 2196 matching lines @@
         return nullptr;
     return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const
 {
     return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 } // namespace blink