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..902b5632ec4a5f3f889e425e21ef9161691daa6b 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodController.h
+++ b/third_party/WebKit/Source/core/editing/InputMethodController.h
@@ -57,17 +57,20 @@ 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);
-    // Inserts the text that is being composed or specified non-empty text and
-    // returns true.
-    bool confirmCompositionOrInsertText(const String& text, ConfirmCompositionBehavior);
+
+    // Deletes ongoing composing text if any, inserts specified text, and
+    // changes the selection according to relativeCaretPosition, which is
+    // relative to the end of the inserting text.
+    bool commitText(const String& text, int relativeCaretPosition);
+
+    // Inserts ongoing composing text; changes the selection to the end of
+    // the inserting text if DoNotKeepSelection, or holds the selection if
+    // KeepSelection.
+    bool finishComposingText(ConfirmCompositionBehavior);
+
     // Deletes the existing composition text.
     void cancelComposition();
+
     void cancelCompositionIfSelectionIsInvalid();
     EphemeralRange compositionEphemeralRange() const;
     Range* compositionRange() const;
@@ -111,6 +114,18 @@ private:
     String composingText() const;
     void selectComposition() const;
     bool setSelectionOffsets(const PlainTextRange&, FrameSelection::SetSelectionOptions = FrameSelection::CloseTyping);
+
+    bool insertText(const String&);
+    bool insertTextAndMoveCaret(const String&, int relativeCaretPosition);
+
+    // Inserts the given text string in the place of the existing composition
+    // and returns true.

[yosin_UTC9, 2016/09/07 07:19:22]

Please add an explanation of returning false.

[yabinh, 2016/09/07 10:27:15]

Done.

+    bool replaceComposition(const String& text, ConfirmCompositionBehavior confirmBehavior);
+    // Inserts the given text string in the place of the existing composition
+    // and moves caret.

[yosin_UTC9, 2016/09/07 07:19:22]

Please add an explanation of bool return value.

[yabinh, 2016/09/07 10:27:15]

Done.

+    bool replaceCompositionAndMoveCaret(const String&, int relativeCaretPosition);
+
+    bool moveCaret(int newCaretPosition);

[yosin_UTC9, 2016/09/07 07:19:22]

Please add an explanation of bool return value.

[yabinh, 2016/09/07 10:27:15]

Done.

 };
 
 } // namespace blink