Fix setComposingText when newCursorPosition != 1

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 213 matching lines @@
     if (!selection.isNone() && !m_compositionRange->collapsed()) {
         if (selection.start().compareTo(m_compositionRange->startPosition()) >= 0
             && selection.end().compareTo(m_compositionRange->endPosition()) <= 0)
             return;
     }
 
     cancelComposition();
     frame().chromeClient().didCancelCompositionOnSelectionChange();
 }
 
-void InputMethodController::setComposition(const String& text, const Vector<CompositionUnderline>& underlines, unsigned selectionStart, unsigned selectionEnd)
+void InputMethodController::setComposition(const String& text, const Vector<CompositionUnderline>& underlines, int selectionStart, int selectionEnd)
 {
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
     // Updates styles before setting selection for composition to prevent
     // inserting the previous composition text into text nodes oddly.
     // See https://bugs.webkit.org/show_bug.cgi?id=46868
     frame().document()->updateLayoutTree();
 
     selectComposition();
 
@@ skipping 67 matching lines @@
     m_isDirty = true;
     m_hasComposition = true;
     if (!m_compositionRange)
         m_compositionRange = Range::create(baseNode->document());
     m_compositionRange->setStart(baseNode, baseOffset);
     m_compositionRange->setEnd(baseNode, extentOffset);
 
     if (baseNode->layoutObject())
         baseNode->layoutObject()->setShouldDoFullPaintInvalidation();
 
-    unsigned start = std::min(baseOffset + selectionStart, extentOffset);
-    unsigned end = std::min(std::max(start, baseOffset + selectionEnd), extentOffset);
-    RefPtrWillBeRawPtr<Range> selectedRange = Range::create(baseNode->document(), baseNode, start, baseNode, end);
-    frame().selection().setSelectedRange(selectedRange.get(), TextAffinity::Downstream, SelectionDirectionalMode::NonDirectional, NotUserTriggered);
+    // The case when cursor position exceeds left boundary is handled here
+    int start = std::max(static_cast<int>(baseOffset) + selectionStart, 0);

[Changwan Ryu, 2016/04/04 06:23:13]

Why do you remove the logic around extentOffset?

[yabinh, 2016/04/04 08:31:51]

extendoffset = length(text before composing region) + length(text).

Since there might be text on the right of the composing region, if I don't
remove it, the cursor can't move to right further. I.E.,
setComposingText(text,newCursorPosition) will behave the same as
setComposingText(text,1) for any newCursorPosition>1.

+    int end = std::max(static_cast<int>(baseOffset) + selectionEnd, start);
+
+    Element* rootEditableElement = frame().selection().rootEditableElement();
+    if (!rootEditableElement)
+        return;
+
+    // The case when cursor position exceeds right boundary is handled here
+    const EphemeralRange selectedRange = PlainTextRange(start, end).createRange(*rootEditableElement);

[Changwan Ryu, 2016/04/04 06:23:13]

Why did you remove RefPtrWillberawPtr?

[yabinh, 2016/04/04 08:31:51]

RefPtrWillberawPtr is only used to create selectedRange. Since another method is
used to create selectedRange, RefPtrWillberawPtr is not used any more.

+
+    frame().selection().setSelectedRange(selectedRange, TextAffinity::Downstream, SelectionDirectionalMode::NonDirectional, NotUserTriggered);
 
     if (underlines.isEmpty()) {
         frame().document()->markers().addCompositionMarker(m_compositionRange->startPosition(), m_compositionRange->endPosition(), Color::black, false, LayoutTheme::theme().platformDefaultCompositionBackgroundColor());
         return;
     }
     for (const auto& underline : underlines) {
         unsigned underlineStart = baseOffset + underline.startOffset;
         unsigned underlineEnd = baseOffset + underline.endOffset;
         EphemeralRange ephemeralLineRange = EphemeralRange(Position(baseNode, underlineStart), Position(baseNode, underlineEnd));
         if (ephemeralLineRange.isNull())
@@ skipping 117 matching lines @@
     TypingCommand::deleteSelection(*frame().document());
 }
 
 DEFINE_TRACE(InputMethodController)
 {
     visitor->trace(m_frame);
     visitor->trace(m_compositionRange);
 }
 
 } // namespace blink