Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/core/editing/InputMethodController.h

Index: third_party/WebKit/Source/core/editing/InputMethodController.h
diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.h b/third_party/WebKit/Source/core/editing/InputMethodController.h
index 2a36cd448c04744b1a4cd951af5f87b778700fef..e180b49e5d767d5adf0395daa17e9fcc8b403ec9 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodController.h
+++ b/third_party/WebKit/Source/core/editing/InputMethodController.h
@@ -57,15 +57,22 @@ public:
     bool hasComposition() const;
     void setComposition(const String&, const Vector<CompositionUnderline>&, int selectionStart, int selectionEnd);
     void setCompositionFromExistingText(const Vector<CompositionUnderline>&, unsigned compositionStart, unsigned compositionEnd);
+
     // Inserts the text that is being composed as a regular text and returns true
     // if composition exists.
     bool confirmComposition();
     // Inserts the given text string in the place of the existing composition
     // and returns true.
-    bool confirmComposition(const String& text, ConfirmCompositionBehavior confirmBehavior = KeepSelection);
+    bool replaceComposition(const String& text, ConfirmCompositionBehavior confirmBehavior);
+
     // Inserts the text that is being composed or specified non-empty text and
-    // returns true.
-    bool confirmCompositionOrInsertText(const String& text, ConfirmCompositionBehavior);
+    // returns true. This will not change the selection.
+    bool confirmComposition(const String& text);
+    // Inserts the text that is being composed or specified non-empty text and
+    // returns true. This will change the selection according to
+    // relativeCursorPosition.
+    bool confirmCompositionWithCursor(const String& text, int relativeCursorPosition);
+
     // Deletes the existing composition text.
     void cancelComposition();
     void cancelCompositionIfSelectionIsInvalid();
@@ -111,6 +118,7 @@ private:
     String composingText() const;
     void selectComposition() const;
     bool setSelectionOffsets(const PlainTextRange&, FrameSelection::SetSelectionOptions = FrameSelection::CloseTyping);
+    bool insertText(const String&);
 };
 
 } // namespace blink