Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/core/editing/InputMethodController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 328 matching lines @@
 
     Element* rootEditableElement = frame().selection().rootEditableElement();
     if (!rootEditableElement)
         return;
 
     // In case of exceeding the right boundary.
     // If both |value1| and |value2| exceed right boundary,
     // PlainTextRange(value1, value2)::createRange() will return a default
     // value, which is [0,0]. In order to get the correct Position in that case,
     // we should make sure |value1| is within range at least.
     const EphemeralRange& startRange = PlainTextRange(0, start).createRange(*rootEditableElement);

[Changwan Ryu, 2016/05/24 08:35:50]

There is a bit of duplicacy between setComposition() and setEditable...()
functions. Could you refactor the common part into one function?

     const EphemeralRange& endRange = PlainTextRange(0, end).createRange(*rootEditableElement);
 
     // TODO(yabinh): There should be a better way to create |startPosition| and
     // |endPosition|. But for now, since we can't get |anchorNode| and |offset|,
     // we can't create the 2 Position objects directly. So we use
     // PlainTextRange::createRange as a workaround.
     const Position& startPosition = startRange.endPosition();
     const Position& endPosition = endRange.endPosition();
     Range* selectedRange = Range::create(rootEditableElement->document(), startPosition, endPosition);
     frame().selection().setSelectedRange(selectedRange, TextAffinity::Downstream, SelectionDirectionalMode::NonDirectional, NotUserTriggered);
@@ skipping 90 matching lines @@
     return frame().selection().setSelectedRange(range, VP_DEFAULT_AFFINITY, SelectionDirectionalMode::NonDirectional, FrameSelection::CloseTyping);
 }
 
 bool InputMethodController::setEditableSelectionOffsets(const PlainTextRange& selectionOffsets)
 {
     if (!editor().canEdit())
         return false;
     return setSelectionOffsets(selectionOffsets);
 }
 
+bool InputMethodController::setEditableSelectionOffsetsWithBoundaryCheck(int start, int end)
+{
+    if (!editor().canEdit())
+        return false;
+
+    // In case of exceeding left boundary.
+    start = std::max(start, 0);
+    end = std::max(end, 0);

[Changwan Ryu, 2016/05/24 08:35:50]

s/0/start/ ?

+
+    Element* rootEditableElement = frame().selection().rootEditableElement();
+    if (!rootEditableElement)
+        return false;
+
+    // In case of exceeding the right boundary.
+    // If both |value1| and |value2| exceed right boundary,
+    // PlainTextRange(value1, value2)::createRange() will return a default
+    // value, which is [0,0]. In order to get the correct Position in that case,
+    // we should make sure |value1| is within range at least.
+    const EphemeralRange& startRange = PlainTextRange(0, start).createRange(*rootEditableElement);
+    if (startRange.isNull())
+        return false;
+    const EphemeralRange& endRange = PlainTextRange(0, end).createRange(*rootEditableElement);
+    if (endRange.isNull())
+        return false;
+
+    const Position& startPosition = startRange.endPosition();
+    const Position& endPosition = endRange.endPosition();
+    const EphemeralRange& range = EphemeralRange(startPosition, endPosition);
+    if (range.isNull())
+        return false;
+
+    return frame().selection().setSelectedRange(range, VP_DEFAULT_AFFINITY, SelectionDirectionalMode::NonDirectional, FrameSelection::CloseTyping);
+}
+
 void InputMethodController::extendSelectionAndDelete(int before, int after)
 {
     if (!editor().canEdit())
         return;
     PlainTextRange selectionOffsets(getSelectionOffsets());
     if (selectionOffsets.isNull())
         return;
 
     // A common call of before=1 and after=0 will fail if the last character
     // is multi-code-word UTF-16, including both multi-16bit code-points and
@@ skipping 19 matching lines @@
     TypingCommand::deleteSelection(*frame().document());
 }
 
 DEFINE_TRACE(InputMethodController)
 {
     visitor->trace(m_frame);
     visitor->trace(m_compositionRange);
 }
 
 } // namespace blink