Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebFrameWidgetImpl.h

 /*
  * Copyright (C) 2014 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 80 matching lines @@
         const WebFloatSize& mainFrameDelta,
         const WebFloatSize& elasticOverscrollDelta,
         float pageScaleDelta,
         float topControlsDelta) 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) override;

[Changwan Ryu, 2016/08/03 07:37:30]

you shouldn't change this one.

[yabinh, 2016/08/08 07:33:44]

Done.

+    bool confirmComposition(ConfirmCompositionBehavior selectionBehavior, int newCursorPosition) override;

[Changwan Ryu, 2016/08/03 07:37:30]

you shouldn't change this one.

[yabinh, 2016/08/08 07:33:44]

Done.

+    bool confirmComposition(const WebString& text, int newCursorPosition) override;
     bool compositionRange(size_t* location, size_t* length) override;
     WebTextInputInfo textInputInfo() override;
     WebTextInputType textInputType() override;
     WebColor backgroundColor() 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;
     bool isAcceleratedCompositingActive() const override;
@@ skipping 84 matching lines @@
     WebInputEventResult handleCharEvent(const WebKeyboardEvent&) override;
 
     WebViewImpl* view() const { return m_localRoot->viewImpl(); }
 
     // This method returns the focused frame belonging to this WebWidget, that
     // is, a focused frame with the same local root as the one corresponding
     // to this widget. It will return nullptr if no frame is focused or, the
     // focused frame has a different local root.
     LocalFrame* focusedLocalFrameInWidget() const;
 
-    bool confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior) const;
+    bool confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior, int newCursorPosition) const;
 
     WebPlugin* focusedPluginIfInputMethodSupported(LocalFrame*) const;
 
     WebString inputModeOfFocusedElement() const;
 
     int textInputFlags() const;
 
     LocalFrame* focusedLocalFrameAvailableForIme() const;
 
     WebWidgetClient* m_client;
@@ skipping 34 matching lines @@
     WebColor m_baseBackgroundColor;
 
     SelfKeepAlive<WebFrameWidgetImpl> m_selfKeepAlive;
 };
 
 DEFINE_TYPE_CASTS(WebFrameWidgetImpl, WebFrameWidgetBase, widget, widget->forSubframe(), widget.forSubframe());
 
 } // namespace blink
 
 #endif