Handle newCursorPosition correctly for Android's commitText()

content/renderer/render_widget.cc

 // Copyright (c) 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/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1484 matching lines @@
     // If we failed to set the composition text, then we need to let the browser
     // process to cancel the input method's ongoing composition session, to make
     // sure we are in a consistent state.
     Send(new InputHostMsg_ImeCancelComposition(routing_id()));
   }
   UpdateCompositionInfo(true);
 }
 
 void RenderWidget::OnImeConfirmComposition(const base::string16& text,
                                            const gfx::Range& replacement_range,
-                                           bool keep_selection) {
+                                           bool keep_selection,
+                                           int new_cursor_pos) {
   if (!ShouldHandleImeEvent())
     return;
   ImeEventGuard guard(this);
   input_handler_->set_handling_input_event(true);
   if (text.length())
-    webwidget_->confirmComposition(text);
+    webwidget_->confirmComposition(text, new_cursor_pos);
   else if (keep_selection)
-    webwidget_->confirmComposition(WebWidget::KeepSelection);
+    webwidget_->confirmComposition(WebWidget::KeepSelection, new_cursor_pos);
   else
-    webwidget_->confirmComposition(WebWidget::DoNotKeepSelection);
+    webwidget_->confirmComposition(WebWidget::DoNotKeepSelection,
+                                   new_cursor_pos);
   input_handler_->set_handling_input_event(false);
   UpdateCompositionInfo(true);
 }
 
 void RenderWidget::OnDeviceScaleFactorChanged() {
   if (!compositor_)
     return;
   if (IsUseZoomForDSFEnabled())
     compositor_->SetPaintedDeviceScaleFactor(GetOriginalDeviceScaleFactor());
   else
@@ skipping 566 matching lines @@
 }
 
 float RenderWidget::GetOriginalDeviceScaleFactor() const {
   return
       screen_metrics_emulator_ ?
       screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
       device_scale_factor_;
 }
 
 }  // namespace content