Blink handle selection handle visibility

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 83 matching lines @@
 }
 
 FrameSelection::FrameSelection(LocalFrame* frame)
     : m_frame(frame),
       m_pendingSelection(PendingSelection::create(*this)),
       m_selectionEditor(SelectionEditor::create(*this)),
       m_granularity(CharacterGranularity),
       m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()),
       m_focused(frame->page() &&
                 frame->page()->focusController().focusedFrame() == frame),
+      m_handleVisibility(HandleVisibility::NotVisible),

[yosin_UTC9, 2016/10/19 06:33:05]

nit: Let's initialize in class declaration instead of here.

[amaralp, 2016/10/21 03:47:18]

Done.

       m_frameCaret(new FrameCaret(frame, *m_selectionEditor)) {
   DCHECK(frame);
 }
 
 FrameSelection::~FrameSelection() {}
 
 const Document& FrameSelection::document() const {
   DCHECK(m_document);
   return *m_document;
 }
@@ skipping 37 matching lines @@
 }
 
 const VisibleSelectionInFlatTree& FrameSelection::selectionInFlatTree() const {
   return visibleSelection<EditingInFlatTreeStrategy>();
 }
 
 void FrameSelection::moveTo(const VisiblePosition& pos,
                             EUserTriggered userTriggered,
                             CursorAlignOnScroll align) {
   SetSelectionOptions options = CloseTyping | ClearTypingStyle | userTriggered;
+  bool isHandleVisible = userTriggered == UserTriggered;

[yosin_UTC9, 2016/10/19 06:33:05]

nit: This variable name makes me confusing, shouldHandleVisible is better.
nit: We don't need to use constant variable |isHandleVisible| here.
Note: I introduce |moveCaretSelection()| as replacement of |moveTo()| for moving
an implementation from |WebLocalFrameImpl|, http://crrev.com/2431153002

[amaralp, 2016/10/21 03:47:18]

Done.

+  if (isHandleVisible)
+    options |= HandleVisible;
   setSelection(createVisibleSelection(pos, pos, selection().isDirectional()),
                options, align);
 }
 
 // TODO(xiaochengh): We should not use reference to return value.
 template <typename Strategy>
 static void adjustEndpointsAtBidiBoundary(
     VisiblePositionTemplate<Strategy>& visibleBase,
     VisiblePositionTemplate<Strategy>& visibleExtent) {
   DCHECK(visibleBase.isValid());
@@ skipping 40 matching lines @@
           base.rightBoundaryOfBidiRun(extent.bidiLevelOnLeft()))) {
     visibleExtent = createVisiblePosition(fromPositionInDOMTree<Strategy>(
         extent.positionAtRightBoundaryOfBiDiRun()));
     return;
   }
 }
 
 void FrameSelection::setNonDirectionalSelectionIfNeeded(
     const VisibleSelectionInFlatTree& passedNewSelection,
     TextGranularity granularity,
-    EndPointsAdjustmentMode endpointsAdjustmentMode) {
+    EndPointsAdjustmentMode endpointsAdjustmentMode,
+    const HandleVisibility& handleVisibility) {

[yosin_UTC9, 2016/10/19 06:33:05]

Since |HandleVisibility| is |enum|, we don't need to use const-ref.

[amaralp, 2016/10/21 03:47:18]

Done.

   VisibleSelectionInFlatTree newSelection = passedNewSelection;
   bool isDirectional = shouldAlwaysUseDirectionalSelection(m_frame) ||
                        newSelection.isDirectional();
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   const PositionInFlatTree basePosition =
       m_originalBaseInFlatTree.deepEquivalent();
@@ skipping 17 matching lines @@
     newSelection.setExtent(newExtent);
   } else if (originalBase.isNotNull()) {
     if (visibleSelection<EditingInFlatTreeStrategy>().base() ==
         newSelection.base())
       newSelection.setBase(originalBase);
     m_originalBaseInFlatTree = VisiblePositionInFlatTree();
   }
 
   // Adjusting base and extent will make newSelection always directional
   newSelection.setIsDirectional(isDirectional);
-  if (visibleSelection<EditingInFlatTreeStrategy>() == newSelection)
+  if (visibleSelection<EditingInFlatTreeStrategy>() == newSelection &&
+      m_handleVisibility == handleVisibility)
     return;
 
-  const SetSelectionOptions options = CloseTyping | ClearTypingStyle;
+  SetSelectionOptions options = CloseTyping | ClearTypingStyle;
+  if (handleVisibility == HandleVisibility::Visible)
+    options |= HandleVisible;
   setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
                granularity);
 }
 
 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();
   if (m_granularityStrategy &&
       (options & FrameSelection::DoNotClearStrategy) == 0)
     m_granularityStrategy->Clear();
   bool closeTyping = options & CloseTyping;
   bool shouldClearTypingStyle = options & ClearTypingStyle;
+  HandleVisibility handleVisibility = options & HandleVisible

[yosin_UTC9, 2016/10/19 06:33:05]

nit: s/HandleVisibility/const HandleVisibility/

[amaralp, 2016/10/21 03:47:18]

Done.

+                                          ? HandleVisibility::Visible
+                                          : HandleVisibility::NotVisible;
   EUserTriggered userTriggered = selectionOptionsToUserTriggered(options);
 
   VisibleSelectionTemplate<Strategy> s = validateSelection(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);
 
   if (shouldClearTypingStyle)
     clearTypingStyle();
 
-  if (m_selectionEditor->visibleSelection<Strategy>() == s) {
+  if (m_selectionEditor->visibleSelection<Strategy>() == s &&
+      m_handleVisibility == handleVisibility) {
     // Even if selection was not changed, selection offsets may have been
     // changed.
     m_frame->inputMethodController().cancelCompositionIfSelectionIsInvalid();
     notifyLayoutObjectOfSelectionChange(userTriggered);
     return;
   }
 
   const VisibleSelectionTemplate<Strategy> oldSelection =
       visibleSelection<Strategy>();
   const VisibleSelection oldSelectionInDOMTree = selection();
 
+  m_handleVisibility = handleVisibility;
   m_selectionEditor->setVisibleSelection(s, options);
   m_frameCaret->setCaretRectNeedsUpdate();
 
   if (!s.isNone() && !(options & DoNotSetFocus)) {
     setFocusedNodeIfNeeded();
     // |setFocusedNodeIfNeeded()| dispatches sync events "FocusOut" and
     // "FocusIn", |m_frame| may associate to another document.
     if (!isAvailable() || document() != currentDocument) {
       // Once we get test case to reach here, we should change this
       // if-statement to |DCHECK()|.
@@ skipping 514 matching lines @@
 
 void FrameSelection::dataWillChange(const CharacterData& node) {
   m_frameCaret->dataWillChange(node);
 }
 
 void FrameSelection::paintCaret(GraphicsContext& context,
                                 const LayoutPoint& paintOffset) {
   m_frameCaret->paintCaret(context, paintOffset);
 }
 
-bool FrameSelection::contains(const LayoutPoint& point) {
-  if (document().layoutViewItem().isNull())
-    return false;
-
+bool FrameSelection::contains(const HitTestResult& result) {
   // Treat a collapsed selection like no selection.
   const VisibleSelectionInFlatTree& visibleSelection =
       this->visibleSelection<EditingInFlatTreeStrategy>();
   if (!visibleSelection.isRange())
     return false;
 
-  HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
-  HitTestResult result(request, point);
-  document().layoutViewItem().hitTest(result);
   Node* innerNode = result.innerNode();
   if (!innerNode || !innerNode->layoutObject())
     return false;
 
   const VisiblePositionInFlatTree& visiblePos =
       createVisiblePosition(fromPositionInDOMTree<EditingInFlatTreeStrategy>(
           innerNode->layoutObject()->positionForPoint(result.localPoint())));
   if (visiblePos.isNull())
     return false;
 
   const VisiblePositionInFlatTree& visibleStart =
       visibleSelection.visibleStart();
   const VisiblePositionInFlatTree& visibleEnd = visibleSelection.visibleEnd();
   if (visibleStart.isNull() || visibleEnd.isNull())
     return false;
 
   const PositionInFlatTree& start = visibleStart.deepEquivalent();
   const PositionInFlatTree& end = visibleEnd.deepEquivalent();
   const PositionInFlatTree& pos = visiblePos.deepEquivalent();
   return start.compareTo(pos) <= 0 && pos.compareTo(end) <= 0;
 }
 
+bool FrameSelection::contains(const LayoutPoint& point) {
+  if (document().layoutViewItem().isNull())
+    return false;
+
+  HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
+  HitTestResult result(request, point);
+  document().layoutViewItem().hitTest(result);
+
+  return contains(result);
+}
+
 // Workaround for the fact that it's hard to delete a frame.
 // Call this after doing user-triggered selections to make it easy to delete the
 // frame you entirely selected. Can't do this implicitly as part of every
 // setSelection call because in some contexts it might not be good for the focus
 // to move to another frame. So instead we call it from places where we are
 // selecting with the mouse or the keyboard after setting the selection.
 void FrameSelection::selectFrameElementInParentIfFullySelected() {
   // Find the parent frame; if there is none, then we have nothing to do.
   Frame* parent = m_frame->tree().parent();
   if (!parent)
@@ skipping 546 matching lines @@
 }
 
 void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
   if (isNone())
     return;
 
   VisibleSelection newSelection =
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
   setSelection(newSelection,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
-                   FrameSelection::DoNotClearStrategy | UserTriggered,
+                   FrameSelection::DoNotClearStrategy | UserTriggered |
+                   FrameSelection::HandleVisible,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
 void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
                                         const VisiblePosition& extentPosition,
                                         TextGranularity granularity) {
   VisibleSelection newSelection =
       createVisibleSelection(basePosition, extentPosition);
   newSelection.expandUsingGranularity(granularity);
 
   if (newSelection.isNone())
     return;
-
-  setSelection(newSelection, granularity);
+  SetSelectionOptions options = CloseTyping | ClearTypingStyle;
+  if (isHandleVisible())
+    options |= HandleVisible;
+  setSelection(newSelection, options, 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 32 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif