Handle newCursorPosition correctly for Android's commitText()

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 538 matching lines @@
       text.utf8(),
       std_underlines,
       selectionStart,
       selectionEnd));
   // TODO(kochi): This assumes the IPC handling always succeeds.
   return true;
 }
 
 bool BrowserPlugin::confirmComposition(
     const blink::WebString& text,
-    blink::WebWidget::ConfirmCompositionBehavior selectionBehavior) {
+    blink::WebWidget::ConfirmCompositionBehavior selection_behavior,
+    int relative_cursor_pos) {
   if (!attached())
     return false;
-  bool keep_selection = (selectionBehavior == blink::WebWidget::KeepSelection);
+  bool keep_selection = (selection_behavior == blink::WebWidget::KeepSelection);
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_ImeConfirmComposition(
-          browser_plugin_instance_id_,
-          text.utf8(),
-          keep_selection));
+          browser_plugin_instance_id_, text.utf8(), keep_selection,
+          relative_cursor_pos));
   // TODO(kochi): This assumes the IPC handling always succeeds.
   return true;
 }
 
 void BrowserPlugin::extendSelectionAndDelete(int before, int after) {
   if (!attached())
     return;
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_ExtendSelectionAndDelete(
           browser_plugin_instance_id_,
@@ skipping 16 matching lines @@
 
 bool BrowserPlugin::HandleMouseLockedInputEvent(
     const blink::WebMouseEvent& event) {
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(browser_plugin_instance_id_,
                                                 &event));
   return true;
 }
 
 }  // namespace content