Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * 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 526 matching lines @@
     // selectionStart and selectionEnd, WebKit somehow won't paint the selection
     // at all (see InlineTextBox::paint() function in InlineTextBox.cpp).
     // But the selection range actually takes effect.
     inputMethodController.setComposition(String(text),
         CompositionUnderlineVectorBuilder(underlines),
         selectionStart, selectionEnd);
 
     return text.isEmpty() || inputMethodController.hasComposition();
 }
 
-bool WebFrameWidgetImpl::confirmComposition()
+bool WebFrameWidgetImpl::confirmComposition(int newCursorPosition)
 {
-    return confirmComposition(DoNotKeepSelection);
+    return confirmComposition(DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior)
+bool WebFrameWidgetImpl::confirmComposition(ConfirmCompositionBehavior selectionBehavior, int newCursorPosition)
 {
-    return confirmComposition(WebString(), selectionBehavior);
+    return confirmComposition(WebString(), selectionBehavior, newCursorPosition);

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

you can simply pass 1 here.

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

Done.

 }
 
-bool WebFrameWidgetImpl::confirmComposition(const WebString& text)
+bool WebFrameWidgetImpl::confirmComposition(const WebString& text, int newCursorPosition)
 {
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    return confirmComposition(text, DoNotKeepSelection);
+    return confirmComposition(text, DoNotKeepSelection, newCursorPosition);
 }
 
-bool WebFrameWidgetImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior) const
+bool WebFrameWidgetImpl::confirmComposition(const WebString& text, ConfirmCompositionBehavior selectionBehavior, int newCursorPosition) const
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return false;
 
     if (WebPlugin* plugin = focusedPluginIfInputMethodSupported(focused))
-        return plugin->confirmComposition(text, selectionBehavior);
+        return plugin->confirmComposition(text, selectionBehavior, newCursorPosition);
 
-    return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection);
+    return focused->inputMethodController().confirmCompositionOrInsertText(text, selectionBehavior == KeepSelection ? InputMethodController::KeepSelection : InputMethodController::DoNotKeepSelection, newCursorPosition);
 }
 
 bool WebFrameWidgetImpl::compositionRange(size_t* location, size_t* length)
 {
     LocalFrame* focused = focusedLocalFrameAvailableForIme();
     if (!focused)
         return false;
 
     const EphemeralRange range = focused->inputMethodController().compositionEphemeralRange();
     if (range.isNull())
@@ skipping 878 matching lines @@
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const
 {
     if (!m_imeAcceptEvents)
         return nullptr;
     return focusedLocalFrameInWidget();
 }
 
 } // namespace blink