Removing HandleVisible enum from FrameSelection

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 150 matching lines @@
   DCHECK(!document().needsLayoutTreeUpdate());
 
   Element* const editable = rootEditableElement();
   if (!editable)
     return;
 
   const VisiblePosition position =
       visiblePositionForContentsPoint(point, frame());
   SelectionInDOMTree::Builder builder;
   builder.setIsDirectional(selection().isDirectional());
+  builder.setIsHandleVisible(true);
   if (position.isNotNull())
     builder.collapse(position.toPositionWithAffinity());
-  setSelection(builder.build(),
-               CloseTyping | ClearTypingStyle | UserTriggered | HandleVisible);
+  setSelection(builder.build(), CloseTyping | ClearTypingStyle | UserTriggered);
 }
 
 template <typename Strategy>
 void FrameSelection::setSelectionAlgorithm(
     const VisibleSelectionTemplate<Strategy>& newSelection,
+    HandleVisibility handleVisibility,
     SetSelectionOptions options,
     CursorAlignOnScroll align,
     TextGranularity granularity) {
   DCHECK(isAvailable());
   DCHECK(newSelection.isValidFor(document()));
   const Document& currentDocument = document();
   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;
   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;
 
@@ skipping 93 matching lines @@
                                   CursorAlignOnScroll align,
                                   TextGranularity granularity) {
   if (!newSelection.isNone()) {
     // TODO(editing-dev): The use of
     // updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     newSelection.base()
         .document()
         ->updateStyleAndLayoutIgnorePendingStylesheets();
   }
-  setSelection(createVisibleSelection(newSelection), options, align,
-               granularity);
+  setSelection(createVisibleSelection(newSelection),
+               newSelection.isHandleVisible() ? HandleVisibility::Visible
+                                              : HandleVisibility::NotVisible,
+               options, align, granularity);
 }
 
 // TODO(yosin): We will make |selectionInFlatTree| version of |SetSelection()|
 // as primary function instead of wrapper.
 void FrameSelection::setSelection(const SelectionInFlatTree& newSelection,
                                   SetSelectionOptions options,
                                   CursorAlignOnScroll align,
                                   TextGranularity granularity) {
   if (!newSelection.isNone()) {
     // TODO(editing-dev): The use of
     // updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     newSelection.base()
         .document()
         ->updateStyleAndLayoutIgnorePendingStylesheets();
   }
-  setSelection(createVisibleSelection(newSelection), options, align,
-               granularity);
+  setSelection(createVisibleSelection(newSelection),
+               newSelection.isHandleVisible() ? HandleVisibility::Visible
+                                              : HandleVisibility::NotVisible,
+               options, align, granularity);
 }
 
 void FrameSelection::setSelection(const VisibleSelection& newSelection,
+                                  HandleVisibility handleVisibility,
                                   SetSelectionOptions options,
                                   CursorAlignOnScroll align,
                                   TextGranularity granularity) {
-  setSelectionAlgorithm<EditingStrategy>(newSelection, options, align,
-                                         granularity);
+  setSelectionAlgorithm<EditingStrategy>(newSelection, handleVisibility,
+                                         options, align, granularity);
 }
 
 void FrameSelection::setSelection(
     const VisibleSelectionInFlatTree& newSelection,
+    HandleVisibility handleVisibility,
     SetSelectionOptions options,
     CursorAlignOnScroll align,
     TextGranularity granularity) {
-  setSelectionAlgorithm<EditingInFlatTreeStrategy>(newSelection, options, align,
-                                                   granularity);
+  setSelectionAlgorithm<EditingInFlatTreeStrategy>(
+      newSelection, handleVisibility, options, align, granularity);
 }
 
 static bool removingNodeRemovesPosition(Node& node, const Position& position) {
   if (!position.anchorNode())
     return false;
 
   if (position.anchorNode() == node)
     return true;
 
   if (!node.isElementNode())
@@ skipping 255 matching lines @@
     return;
   // TODO(yosin): We should move to call |TypingCommand::closeTyping()| to
   // |Editor| class.
   if (!document().isRunningExecCommand())
     TypingCommand::closeTyping(m_frame);
   VisibleSelection newSelection;
   if (selection().isBaseFirst())
     newSelection.setWithoutValidation(start, end);
   else
     newSelection.setWithoutValidation(end, start);
-  setSelection(newSelection, DoNotSetFocus);
+  setSelection(newSelection, HandleVisibility::NotVisible, DoNotSetFocus);

[yosin_UTC9, 2017/02/06 05:33:28]

To reduce code change, can we introduce:

FrameSelection::setSelection(const VisibleSelection& visibleSeleciton,
SetSelectionOptions options) {
  setSelection(visibleSelection, HandleVisibilit::NotVisible, options);
}

 }
 
 void FrameSelection::didChangeFocus() {
   // Hits in
   // virtual/gpu/compositedscrolling/scrollbars/scrollbar-miss-mousemove-disabled.html
   DisableCompositingQueryAsserts disabler;
   updateAppearance();
 }
 
 static DispatchEventResult dispatchSelectStart(
@@ skipping 31 matching lines @@
     // another element. See snav-input.html and snav-textarea.html
     if (isSpatialNavigationEnabled(m_frame))
       return false;
     // Even if selection isn't changed, we prevent to default action, e.g.
     // scroll window when caret is at end of content editable.
     return true;
   }
 
   const SetSelectionOptions options =
       CloseTyping | ClearTypingStyle | userTriggered;
-  setSelection(selectionModifier.selection(), options);
+  setSelection(selectionModifier.selection(), HandleVisibility::NotVisible,
+               options);
 
   if (granularity == LineGranularity || granularity == ParagraphGranularity)
     m_xPosForVerticalArrowNavigation =
         selectionModifier.xPosForVerticalArrowNavigation();
 
   if (userTriggered == UserTriggered)
     m_granularity = CharacterGranularity;
 
   m_frameCaret->setCaretRectNeedsUpdate();
 
   return true;
 }
 
 bool FrameSelection::modify(EAlteration alter,
                             unsigned verticalDistance,
                             VerticalDirection direction) {
   SelectionModifier selectionModifier(*frame(), selection());
   if (!selectionModifier.modifyWithPageGranularity(alter, verticalDistance,
                                                    direction)) {
     return false;
   }
 
-  setSelection(selectionModifier.selection(),
+  setSelection(selectionModifier.selection(), HandleVisibility::NotVisible,
                CloseTyping | ClearTypingStyle | UserTriggered,
                alter == AlterationMove ? CursorAlignOnScroll::Always
                                        : CursorAlignOnScroll::IfNeeded);
 
   m_granularity = CharacterGranularity;
 
   return true;
 }
 
 void FrameSelection::clear() {
@@ skipping 650 matching lines @@
     m_granularityStrategy = WTF::makeUnique<CharacterGranularityStrategy>();
   return m_granularityStrategy.get();
 }
 
 void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
   if (isNone())
     return;
 
   VisibleSelection newSelection =
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
-  setSelection(newSelection,
+  setSelection(newSelection, HandleVisibility::Visible,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
-                   FrameSelection::DoNotClearStrategy | UserTriggered |
-                   FrameSelection::HandleVisible,
+                   FrameSelection::DoNotClearStrategy | UserTriggered,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
 // TODO(yosin): We should make |FrameSelection::moveRangeSelection()| to take
 // two |IntPoint| instead of two |VisiblePosition| like
 // |moveRangeSelectionExtent()|.
 void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
                                         const VisiblePosition& extentPosition,
                                         TextGranularity granularity) {
   VisibleSelection newSelection = createVisibleSelection(
       SelectionInDOMTree::Builder()
           .setBaseAndExtentDeprecated(basePosition.deepEquivalent(),
                                       extentPosition.deepEquivalent())
           .setAffinity(basePosition.affinity())
           .setGranularity(granularity)
           .build());
 
   if (newSelection.isNone())
     return;
 
-  SetSelectionOptions options = CloseTyping | ClearTypingStyle;
-  if (isHandleVisible())
-    options |= HandleVisible;
-  setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
-               granularity);
+  setSelection(newSelection, m_handleVisibility, CloseTyping | ClearTypingStyle,
+               CursorAlignOnScroll::IfNeeded, granularity);
 }
 
 void FrameSelection::updateIfNeeded() {
   DCHECK(!m_frame->document()->needsLayoutTreeUpdate());
   m_selectionEditor->updateIfNeeded();
 }
 
 void FrameSelection::setCaretVisible(bool caretIsVisible) {
   m_frameCaret->setCaretVisibility(caretIsVisible ? CaretVisibility::Visible
                                                   : CaretVisibility::Hidden);
@@ skipping 28 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif