Stop dismissing selection handles when selection is kept

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 164 matching lines @@
 
 template <typename Strategy>
 void FrameSelection::setSelectionAlgorithm(
     const VisibleSelectionTemplate<Strategy>& newSelection,
     SetSelectionOptions options,
     CursorAlignOnScroll align,
     TextGranularity granularity) {
   DCHECK(isAvailable());
   DCHECK(newSelection.isValidFor(document()));
   const Document& currentDocument = document();
+  // TODO(editing-dev): We should rename variable |s| to another name to avoid
+  // using one letter variable name.
+  VisibleSelectionTemplate<Strategy> s = newSelection;
+
   if (m_granularityStrategy &&
       (options & FrameSelection::DoNotClearStrategy) == 0)
     m_granularityStrategy->Clear();
   bool closeTyping = options & CloseTyping;
   bool shouldClearTypingStyle = options & ClearTypingStyle;
-  const HandleVisibility handleVisibility = options & HandleVisible
-                                                ? HandleVisibility::Visible
-                                                : HandleVisibility::NotVisible;
+  const HandleVisibility handleVisibility =
+      (options & HandleVisible || s.isHandleVisible())

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

We don't need to have |SelectionOption::HandleVisible| anymore. Selection handle
visibility is the first class citizen, |newSelection|:SelectionTemplate<DOMTree>
carries selection handle visibility.

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

I just wanted to minimize the scope of this CL to avoid conflict with amaralp@’s
future patch.
amaralp@, please upload a new patch if you have one. I’ll try to make my patch
depend on it if possible. Or I could wait for your patch to land first.

[amaralp, 2017/01/25 03:48:35]

I uploaded a patch crrev.com/2647283006.

+          ? HandleVisibility::Visible
+          : HandleVisibility::NotVisible;
   EUserTriggered userTriggered = selectionOptionsToUserTriggered(options);
-
-  // TODO(editing-dev): We should rename variable |s| to another name to avoid
-  // using one letter variable name.
-  VisibleSelectionTemplate<Strategy> s = newSelection;
   if (shouldAlwaysUseDirectionalSelection(m_frame))
     s.setIsDirectional(true);
 
   m_granularity = granularity;
 
   // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
   // |Editor| class.
   if (closeTyping)
     TypingCommand::closeTyping(m_frame);
 
@@ skipping 1213 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif