Stop dismissing selection handles when selection is kept

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 230 matching lines @@
   frame().selection().setSelection(
       SelectionInDOMTree::Builder().setBaseAndExtent(range).build(), 0);
 }
 
 bool InputMethodController::finishComposingText(
     ConfirmCompositionBehavior confirmBehavior) {
   if (!hasComposition())
     return false;
 
   if (confirmBehavior == KeepSelection) {
-    PlainTextRange oldOffsets = getSelectionOffsets();
+    // Do not dismiss handles even if we are moving selection, because we will
+    // eventually move back to the old selection offsets.
+    bool isHandleVisible = frame().selection().isHandleVisible();
+    EphemeralRange oldSelectionRange =
+        ephemeralRangeForOffsets(getSelectionOffsets());
+
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
     bool result = replaceComposition(composingText());
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited. see http://crbug.com/590369 for more details.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
-    setSelectionOffsets(oldOffsets);
+    if (oldSelectionRange.isNull())
+      return false;
+    SelectionInDOMTree::Builder& selectionBuilder =
+        SelectionInDOMTree::Builder().setBaseAndExtent(oldSelectionRange);
+
+    if (isHandleVisible)

[yosin_UTC9, 2017/01/20 07:54:07]

This line should be include in L268. One of benefit to make SelectionTemplate to
have handle visibility is avoiding control flow.

 const SelectionInDOMTree& selection =
        SelectionInDOMTree::Builder()
         .setBaseAndExtent(oldSelectionRange)
         .setIsHandVisbile(isHandleVisible)
         .build();
  

This is equivalent to your change.

[Changwan Ryu, 2017/01/24 06:38:45]

Done.

+      selectionBuilder.setIsHandleVisible(true);
+
+    frame().selection().setSelection(selectionBuilder.build(),
+                                     FrameSelection::CloseTyping);
     return result;
   }
 
   return replaceCompositionAndMoveCaret(composingText(), 0,
                                         Vector<CompositionUnderline>());
 }
 
 bool InputMethodController::commitText(
     const String& text,
     const Vector<CompositionUnderline>& underlines,
@@ skipping 401 matching lines @@
 PlainTextRange InputMethodController::getSelectionOffsets() const {
   EphemeralRange range = firstEphemeralRangeOf(frame().selection().selection());
   if (range.isNull())
     return PlainTextRange();
   ContainerNode* editable =
       frame().selection().rootEditableElementOrTreeScopeRootNode();
   DCHECK(editable);
   return PlainTextRange::create(*editable, range);
 }
 
+EphemeralRange InputMethodController::ephemeralRangeForOffsets(
+    const PlainTextRange& offsets) const {
+  if (offsets.isNull())
+    return EphemeralRange();
+  Element* rootEditableElement = frame().selection().rootEditableElement();
+  if (!rootEditableElement)
+    return EphemeralRange();
+
+  DCHECK(!document().needsLayoutTreeUpdate());
+
+  return offsets.createRange(*rootEditableElement);
+}
+
 bool InputMethodController::setSelectionOffsets(
     const PlainTextRange& selectionOffsets,
     FrameSelection::SetSelectionOptions options) {

[yosin_UTC9, 2017/01/20 07:54:07]

Please avoid to use FrameSelection::SetSelectionOptions. It is ugly
FrameSelection::setSelection() parameter which we should get rid of.

[Changwan Ryu, 2017/01/24 06:38:45]

Hmm... Most cases passing CloseTyping is necessary, but we should not do that in
the middle of setComposition, according to
https://codereview.chromium.org/2206923002/ .,We still need this parameter for
setComposition.

[yosin_UTC9, 2017/01/24 07:58:27]

I see.

-  if (selectionOffsets.isNull())
-    return false;
-  Element* rootEditableElement = frame().selection().rootEditableElement();
-  if (!rootEditableElement)
-    return false;
-
-  DCHECK(!document().needsLayoutTreeUpdate());
-
-  const EphemeralRange range =
-      selectionOffsets.createRange(*rootEditableElement);
+  const EphemeralRange range = ephemeralRangeForOffsets(selectionOffsets);
   if (range.isNull())
     return false;
 
   return frame().selection().setSelectedRange(
       range, VP_DEFAULT_AFFINITY, SelectionDirectionalMode::NonDirectional,
       options);
 }
 
 bool InputMethodController::setEditableSelectionOffsets(
     const PlainTextRange& selectionOffsets,
@@ skipping 362 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink