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 3ed0698ffd30d902cf32ad9cfd1ec0809747ce09..268c3357772ee792c2a936f7f0012d7b5905a0bc 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -548,25 +548,25 @@ bool WebFrameWidgetImpl::confirmComposition()
 
 bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
 {
-    return confirmComposition(WebString(), selectionBehavior);
+    return confirmComposition(WebString(), selectionBehavior, 1);
 }
 
-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)