Handle newCursorPosition correctly for Android's commitText()

content/renderer/render_frame_impl.cc

 // Copyright 2013 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_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1309 matching lines @@
     int selection_start,
     int selection_end) {
   render_view_->OnImeSetComposition(
       text, underlines, gfx::Range::InvalidRange(),
       selection_start, selection_end);
 }
 
 void RenderFrameImpl::SimulateImeConfirmComposition(
     const base::string16& text,
     const gfx::Range& replacement_range) {
-  render_view_->OnImeConfirmComposition(text, replacement_range, false);
+  render_view_->OnImeConfirmComposition(text, replacement_range, false, 1);
 }
 
 void RenderFrameImpl::OnImeSetComposition(
     const base::string16& text,
     const std::vector<blink::WebCompositionUnderline>& underlines,
     int selection_start,
     int selection_end) {
   // When a PPAPI plugin has focus, we bypass WebKit.
   if (!IsPepperAcceptingCompositionEvents()) {
     pepper_composition_text_ = text;
@@ skipping 16 matching lines @@
     if (!pepper_composition_text_.empty()) {
       focused_pepper_plugin_->HandleCompositionUpdate(
           pepper_composition_text_, underlines, selection_start, selection_end);
     }
   }
 }
 
 void RenderFrameImpl::OnImeConfirmComposition(
     const base::string16& text,
     const gfx::Range& replacement_range,
-    bool keep_selection) {
+    bool keep_selection,
+    int new_cursor_pos) {
   // When a PPAPI plugin has focus, we bypass WebKit.
   // Here, text.empty() has a special meaning. It means to commit the last
   // update of composition text (see
   // RenderWidgetHost::ImeConfirmComposition()).
   const base::string16& last_text = text.empty() ? pepper_composition_text_
                                                  : text;
 
   // last_text is empty only when both text and pepper_composition_text_ is.
   // Ignore it.
   if (last_text.empty())
@@ skipping 4975 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content