Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 119 matching lines @@
         const WebFloatSize& elasticOverscrollDelta,
         float pageScaleDelta,
         float topControlsShownRatioDelta) override;
     void mouseCaptureLost() override;
     void setFocus(bool enable) override;
     bool setComposition(
         const WebString& text,
         const WebVector<WebCompositionUnderline>& underlines,
         int selectionStart,
         int selectionEnd) override;
-    bool confirmComposition() override;
-    bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) override;
-    bool confirmComposition(const WebString& text) override;
+    bool confirmComposition(int newCursorPosition = 1) override;
+    bool confirmComposition(ConfirmCompositionBehavior selectionBehavior, int newCursorPosition = 1) override;
+    bool confirmComposition(const WebString& text, int newCursorPosition = 1) override;
     bool compositionRange(size_t* location, size_t* length) override;
     WebTextInputInfo textInputInfo() override;
     WebTextInputType textInputType() override;
     WebColor backgroundColor() const override;
     WebPagePopup* pagePopup() const override;
     bool selectionBounds(WebRect& anchor, WebRect& focus) const override;
     bool selectionTextDirection(WebTextDirection& start, WebTextDirection& end) const override;
     bool isSelectionAnchorFirst() const override;
     bool caretOrSelectionRange(size_t* location, size_t* length) override;
     void setTextDirection(WebTextDirection) override;
@@ skipping 400 matching lines @@
     explicit WebViewImpl(WebViewClient*);
     ~WebViewImpl() override;
 
     int textInputFlags();
 
     WebString inputModeOfFocusedElement();
 
     // Returns true if the event was actually processed.
     bool keyEventDefault(const WebKeyboardEvent&);
 
-    bool confirmComposition(const WebString& text, ConfirmCompositionBehavior);
+    bool confirmComposition(const WebString& text, ConfirmCompositionBehavior, int newCursorPosition);
 
     // Returns true if the view was scrolled.
     bool scrollViewWithKeyboard(int keyCode, int modifiers);
 
     void hideSelectPopup();
 
     HitTestResult hitTestResultForRootFramePos(const IntPoint&);
     HitTestResult hitTestResultForViewportPos(const IntPoint&);
 
     // Consolidate some common code between starting a drag over a target and
@@ skipping 182 matching lines @@
     double m_lastFrameTimeMonotonic;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif