Handle newCursorPosition correctly for Android's commitText()

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 f5bd894ad689c1babe6d03fe51638a743b44a4e5..266e077b487700d0ac4f2c1f5a5c44eb93bdc89c 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -544,32 +544,32 @@ bool WebFrameWidgetImpl::setComposition(
     return text.isEmpty() || inputMethodController.hasComposition();
 }
 
-bool WebFrameWidgetImpl::confirmComposition()
+bool WebFrameWidgetImpl::confirmComposition(int newCursorPosition)
 {
-    return confirmComposition(DoNotKeepSelection);
+    return confirmComposition(DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
+bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior, int newCursorPosition)
 {
-    return confirmComposition(WebString(), selectionBehavior);
+    return confirmComposition(WebString(), selectionBehavior, newCursorPosition);

[Changwan Ryu, 2016/08/03 07:37:30]

you can simply pass 1 here.

[yabinh, 2016/08/08 07:33:44]

Done.

 }
 
-bool WebFrameWidgetImpl::confirmComposition(const WebString& text)
+bool WebFrameWidgetImpl::confirmComposition(const WebString& text, int newCursorPosition)
 {
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    return confirmComposition(text, DoNotKeepSelection);
+    return confirmComposition(text, DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebFrameWidgetImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior) const
+bool WebFrameWidgetImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior, int newCursorPosition) const
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return false;
 
     if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->confirmComposition(text, selectionBehavior);
+        return plugin->confirmComposition(text, selectionBehavior, newCursorPosition);
 
-    return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
+    return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection, newCursorPosition);
 }
 
 bool WebFrameWidgetImpl::compositionRange(size_t* location, size_t* length)