Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebViewFrameWidget.cpp

 // Copyright 2015 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 "web/WebViewFrameWidget.h"
 
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
@@ skipping 119 matching lines @@
 
 bool WebViewFrameWidget::setComposition(
     const WebString& text,
     const WebVector<WebCompositionUnderline>& underlines,
     int selectionStart,
     int selectionEnd)
 {
     return m_webView->setComposition(text, underlines, selectionStart, selectionEnd);
 }
 
-bool WebViewFrameWidget::confirmComposition()
+bool WebViewFrameWidget::finishComposingText(ConfirmCompositionBehavior selectionBehavior)
 {
-    return m_webView->confirmComposition();
+    return m_webView->finishComposingText(selectionBehavior);
 }
 
-bool WebViewFrameWidget::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
+bool WebViewFrameWidget::commitText(const WebString& text, int relativeCaretPosition)
 {
-    return m_webView->confirmComposition(selectionBehavior);
-}
-
-bool WebViewFrameWidget::confirmComposition(const WebString& text)
-{
-    return m_webView->confirmComposition(text);
+    return m_webView->commitText(text, relativeCaretPosition);
 }
 
 WebRange WebViewFrameWidget::compositionRange()
 {
     return m_webView->compositionRange();
 }
 
 WebTextInputInfo WebViewFrameWidget::textInputInfo()
 {
     return m_webView->textInputInfo();
@@ skipping 128 matching lines @@
 {
     m_webView->attachCompositorAnimationTimeline(compositorTimeline);
 }
 
 void WebViewFrameWidget::detachCompositorAnimationTimeline(CompositorAnimationTimeline* compositorTimeline)
 {
     m_webView->detachCompositorAnimationTimeline(compositorTimeline);
 }
 
 } // namespace blink