Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 9f6deb8a18af307db88738bce4d653a409da7c03..abc0561595ba58bf7b04ddbfaadf2b644a1cd37a 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -2367,32 +2367,32 @@ bool WebViewImpl::setComposition(
     return text.isEmpty() || inputMethodController.hasComposition();
 }
 
-bool WebViewImpl::confirmComposition()
+bool WebViewImpl::confirmComposition(int newCursorPosition)
 {
-    return confirmComposition(DoNotKeepSelection);
+    return confirmComposition(DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebViewImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
+bool WebViewImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior, int newCursorPosition)
 {
-    return confirmComposition(WebString(), selectionBehavior);
+    return confirmComposition(WebString(), selectionBehavior, newCursorPosition);
 }
 
-bool WebViewImpl::confirmComposition(const WebString& text)
+bool WebViewImpl::confirmComposition(const WebString& text, int newCursorPosition)
 {
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    return confirmComposition(text, DoNotKeepSelection);
+    return confirmComposition(text, DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior)
+bool WebViewImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior, int newCursorPosition)
 {
     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 WebViewImpl::compositionRange(size_t* location, size_t* length)