Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/public/web/WebPlugin.h

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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.
@@ skipping 80 matching lines @@
     // NOTE: This container doesn't necessarily own this plugin. For example,
     // if the container has been assigned a new plugin, then the container will
     // own the new plugin, not this old plugin.
     virtual WebPluginContainer* container() const { return nullptr; }
 
     virtual v8::Local<v8::Object> v8ScriptableObject(v8::Isolate*) { return v8::Local<v8::Object>(); }
 
     virtual bool supportsKeyboardFocus() const { return false; }
     virtual bool supportsEditCommands() const { return false; }
     // Returns true if this plugin supports input method, which implements
-    // setComposition() and confirmComposition() below.
+    // setComposition(), commitText() and finishComposingText() below.
     virtual bool supportsInputMethod() const { return false; }
 
     virtual bool canProcessDrag() const { return false; }
 
     virtual void updateAllLifecyclePhases() = 0;
     virtual void paint(WebCanvas*, const WebRect&) = 0;
 
     // Coordinates are relative to the containing window.
     virtual void updateGeometry(
         const WebRect& windowRect, const WebRect& clipRect,
@@ skipping 35 matching lines @@
     virtual bool hasSelection() const { return false; }
     virtual WebString selectionAsText() const { return WebString(); }
     virtual WebString selectionAsMarkup() const { return WebString(); }
 
     virtual bool executeEditCommand(const WebString& name) { return false; }
     virtual bool executeEditCommand(const WebString& name, const WebString& value) { return false; }
 
     // Sets composition text from input method, and returns true if the
     // composition is set successfully.
     virtual bool setComposition(const WebString& text, const WebVector<WebCompositionUnderline>& underlines, int selectionStart, int selectionEnd) { return false; }
-    // Confirms an ongoing composition and returns true if there is an ongoing
-    // composition or the text is inserted.
-    virtual bool confirmComposition(const WebString& text, WebWidget::ConfirmCompositionBehavior selectionBehavior) { return false; }
+
+    // Deletes the ongoing composition if any, inserts the specified text, and
+    // moves the caret according to relativeCaretPosition.
+    virtual bool commitText(const WebString& text, int relativeCaretPosition) { return false; }
+
+    // Confirms an ongoing composition; holds or moves selections accroding to
+    // selectionBehavior.
+    virtual bool finishComposingText(WebWidget::ConfirmCompositionBehavior selectionBehavior) { return false; }
+
     // Deletes the current selection plus the specified number of characters
     // before and after the selection or caret.
     virtual void extendSelectionAndDelete(int before, int after) { }
     // If the given position is over a link, returns the absolute url.
     // Otherwise an empty url is returned.
     virtual WebURL linkAtPosition(const WebPoint& position) const { return WebURL(); }
 
     // Find interface.
     // Start a new search.  The plugin should search for a little bit at a time so that it
     // doesn't block the thread in case of a large document.  The results, along with the
@@ skipping 17 matching lines @@
 
     virtual bool isPlaceholder() { return true; }
 
 protected:
     ~WebPlugin() { }
 };
 
 } // namespace blink
 
 #endif