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 249 matching lines @@
 }
 
 bool InputMethodController::finishComposingText(
     ConfirmCompositionBehavior confirmBehavior) {
   if (!hasComposition())
     return false;
 
   const String& composing = composingText();
 
   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.
+    const bool isHandleVisible = frame().selection().isHandleVisible();
+
+    const PlainTextRange& oldOffsets = getSelectionOffsets();
     Editor::RevealSelectionScope revealSelectionScope(&editor());
 
     clear();
     dispatchCompositionEndEvent(frame(), composing);
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited. see http://crbug.com/590369 for more details.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
-    setSelectionOffsets(oldOffsets);
+
+    const EphemeralRange& oldSelectionRange =
+        ephemeralRangeForOffsets(oldOffsets);
+    if (oldSelectionRange.isNull())
+      return false;
+    const SelectionInDOMTree& selection =
+        SelectionInDOMTree::Builder()
+            .setBaseAndExtent(oldSelectionRange)
+            .setIsHandleVisible(isHandleVisible)
+            .build();
+    frame().selection().setSelection(selection, FrameSelection::CloseTyping);
     return true;
   }
 
   Element* rootEditableElement = frame().selection().rootEditableElement();
   if (!rootEditableElement)
     return false;
   PlainTextRange compositionRange =
       PlainTextRange::create(*rootEditableElement, *m_compositionRange);
   if (compositionRange.isNull())
     return false;
@@ skipping 416 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) {
-  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 367 matching lines @@
   frame().chromeClient().resetInputMethod();
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink