Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/public/web/WebWidget.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 136 matching lines @@
         const WebString& text,
         const WebVector<WebCompositionUnderline>& underlines,
         int selectionStart,
         int selectionEnd) { return false; }
 
     enum ConfirmCompositionBehavior {
         DoNotKeepSelection,
         KeepSelection,
     };
 
+    // Called to inform the WebWidget that deleting the ongoing composition if
+    // any, inserting the specified text, and moving the caret according to
+    // relativeCaretPosition.
+    virtual bool commitText(const WebString& text, int relativeCaretPosition) { return false; }
+
     // Called to inform the WebWidget to confirm an ongoing composition.
-    // This method is same as confirmComposition(WebString());
-    // Returns true if there is an ongoing composition.
-    virtual bool confirmComposition() { return false; } // Deprecated
-    virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) { return false; }
-
-    // Called to inform the WebWidget to confirm an ongoing composition with a
-    // new composition text. If the text is empty then the current composition
-    // text is confirmed. If there is no ongoing composition, then deletes the
-    // current selection and inserts the text. This method has no effect if
-    // there is no ongoing composition and the text is empty.
-    // Returns true if there is an ongoing composition or the text is inserted.
-    virtual bool confirmComposition(const WebString& text) { return false; }
+    virtual bool finishComposingText(ConfirmCompositionBehavior selectionBehavior) { return false; }
 
     // Fetches the character range of the current composition, also called the
     // "marked range."
     virtual WebRange compositionRange() { return WebRange(); }
 
     // Returns information about the current text input of this WebWidget.
     // Note that this query can be expensive for long fields, as it returns the
     // plain-text representation of the current editable element. Consider using
     // the lighter-weight textInputType() when appropriate.
     virtual WebTextInputInfo textInputInfo() { return WebTextInputInfo(); }
@@ skipping 72 matching lines @@
     // Applies the range on the focused frame so that the text will later be replaced.
     virtual void applyReplacementRange(const WebRange&) {}
 
 protected:
     ~WebWidget() { }
 };
 
 } // namespace blink
 
 #endif