Blink handle selection handle visibility

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google 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:
@@ skipping 119 matching lines @@
 
   DCHECK(!m_frame->document()->needsLayoutTreeUpdate());
   Node* innerNode = event.innerNode();
   if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
     return false;
 
   // Extend the selection if the Shift key is down, unless the click is in a
   // link or image.
   bool extendSelection = isExtendingSelection(event);
 
-  // Don't restart the selection when the mouse is pressed on an
-  // existing selection so we can allow for text dragging.
-  if (FrameView* view = m_frame->view()) {
-    LayoutPoint vPoint = view->rootFrameToContents(event.event().position());
-    if (!extendSelection && selection().contains(vPoint)) {
-      m_mouseDownWasSingleClickInSelection = true;
-      return false;
-    }
-  }
-
   VisiblePositionInFlatTree visiblePos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   if (visiblePos.isNull())
     visiblePos = createVisiblePosition(
         PositionInFlatTree::firstPositionInOrBeforeNode(innerNode));
   PositionInFlatTree pos = visiblePos.deepEquivalent();
 
   VisibleSelectionInFlatTree newSelection =
       selection().visibleSelection<EditingInFlatTreeStrategy>();
   TextGranularity granularity = CharacterGranularity;
 
+  // Don't restart the selection when the mouse is pressed on an
+  // existing selection so we can allow for text dragging.
+  if (!extendSelection && selection().contains(event.hitTestResult())) {
+    m_mouseDownWasSingleClickInSelection = true;
+    if (!event.event().fromTouch())
+      return false;
+
+    if (!selection().isHandleVisible()) {
+      updateSelectionForMouseDownDispatchingSelectStart(
+          innerNode, newSelection, granularity, HandleVisibility::Visible);
+      return false;
+    }
+  }
+
   if (extendSelection && !newSelection.isNone()) {
-    // Note: "fast/events/shift-click-user-select-none.html" makes
-    // |pos.isNull()| true.
     SelectionInFlatTree::Builder builder;
     if (pos.isNotNull())
       builder.collapse(pos);
     const VisibleSelectionInFlatTree& selectionInUserSelectAll =
         expandSelectionToRespectUserSelectAll(
             innerNode, createVisibleSelection(builder.build()));
     if (selectionInUserSelectAll.isRange()) {
       if (selectionInUserSelectAll.start().compareTo(newSelection.start()) < 0)
         pos = selectionInUserSelectAll.start();
       else if (newSelection.end().compareTo(selectionInUserSelectAll.end()) < 0)
@@ skipping 25 matching lines @@
     if (visiblePos.isNull()) {
       newSelection = VisibleSelectionInFlatTree();
     } else {
       SelectionInFlatTree::Builder builder;
       builder.collapse(visiblePos.toPositionWithAffinity());
       newSelection = expandSelectionToRespectUserSelectAll(
           innerNode, createVisibleSelection(builder.build()));
     }
   }
 
+  bool isHandleVisible = false;
+  if (newSelection.isContentEditable()) {
+    bool isTextBoxEmpty =
+        VisibleSelection::selectionFromContentsOfNode(innerNode).isCaret();

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

nit: VisibleSelection::selectionFromContentsOfNode() will be gone soon.
Please write as:
createVisibleSelection(SelectionInFlatTree::Builder().selectAllChildren(*innerNode).build()).isCaret()

See http://crrev.com/2432173005

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

Done.

+    bool notLeftClick = event.event().pointerProperties().button !=

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

nit: s/bool/const bool/

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

Done.

+                        WebPointerProperties::Button::Left;
+    if (!isTextBoxEmpty || notLeftClick)
+      isHandleVisible = event.event().fromTouch();
+  }
+
   // Updating the selection is considered side-effect of the event and so it
   // doesn't impact the handled state.
-  updateSelectionForMouseDownDispatchingSelectStart(innerNode, newSelection,
-                                                    granularity);
+  updateSelectionForMouseDownDispatchingSelectStart(
+      innerNode, newSelection, granularity, isHandleVisible
+                                                ? HandleVisibility::Visible
+                                                : HandleVisibility::NotVisible);
   return false;
 }
 
 void SelectionController::updateSelectionForMouseDrag(
     const HitTestResult& hitTestResult,
     Node* mousePressNode,
     const LayoutPoint& dragStartPos,
     const IntPoint& lastKnownMousePosition) {
   if (!m_mouseDownMayStartSelect)
     return;
@@ skipping 109 matching lines @@
     newSelection.expandUsingGranularity(selection().granularity());
 
   selection().setNonDirectionalSelectionIfNeeded(
       newSelection, selection().granularity(),
       FrameSelection::AdjustEndpointsAtBidiBoundary);
 }
 
 bool SelectionController::updateSelectionForMouseDownDispatchingSelectStart(
     Node* targetNode,
     const VisibleSelectionInFlatTree& selection,
-    TextGranularity granularity) {
+    TextGranularity granularity,
+    HandleVisibility visibility) {
   if (targetNode && targetNode->layoutObject() &&
       !targetNode->layoutObject()->isSelectable())
     return false;
 
   if (dispatchSelectStart(targetNode) != DispatchEventResult::NotCanceled)
     return false;
 
   // |dispatchSelectStart()| can change document hosted by |m_frame|.
   if (!this->selection().isAvailable())
     return false;
 
   if (!selection.isValidFor(this->selection().document()))
     return false;
 
   if (selection.isRange()) {
     m_selectionState = SelectionState::ExtendedSelection;
   } else {
     granularity = CharacterGranularity;
     m_selectionState = SelectionState::PlacedCaret;
   }
 
-  this->selection().setNonDirectionalSelectionIfNeeded(selection, granularity);
+  this->selection().setNonDirectionalSelectionIfNeeded(
+      selection, granularity, FrameSelection::DoNotAdjustEndpoints, visibility);
 
   return true;
 }
 
 void SelectionController::selectClosestWordFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace appendTrailingWhitespace,
     SelectInputEventType selectInputEventType) {
   Node* innerNode = result.innerNode();
   VisibleSelectionInFlatTree newSelection;
@@ skipping 12 matching lines @@
 
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(adjustedHitTestResult);
   if (pos.isNotNull()) {
     SelectionInFlatTree::Builder builder;
     builder.collapse(pos.toPositionWithAffinity());
     newSelection = createVisibleSelection(builder.build());
     newSelection.expandUsingGranularity(WordGranularity);
   }
 
+  HandleVisibility visibility = HandleVisibility::NotVisible;

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

Better to use |handleVisibility|, name |visibility| is ambiguous.

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

Done.

   if (selectInputEventType == SelectInputEventType::Touch) {
     // If node doesn't have text except space, tab or line break, do not
     // select that 'empty' area.
     EphemeralRangeInFlatTree range(newSelection.start(), newSelection.end());
     const String& str =
         plainText(range, hasEditableStyle(*innerNode)
                              ? TextIteratorEmitsObjectReplacementCharacter
                              : TextIteratorDefaultBehavior);
     if (str.isEmpty() || str.simplifyWhiteSpace().containsOnlyWhitespace())
       return;
 
     if (newSelection.rootEditableElement() &&
         pos.deepEquivalent() ==
             VisiblePositionInFlatTree::lastPositionInNode(
                 newSelection.rootEditableElement())
                 .deepEquivalent())
       return;
+    visibility = HandleVisibility::Visible;
   }
 
   if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend &&
       newSelection.isRange())
     newSelection.appendTrailingWhitespace();
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
-      WordGranularity);
+      WordGranularity, visibility);
 }
 
 void SelectionController::selectClosestMisspellingFromHitTestResult(
     const HitTestResult& result,
     AppendTrailingWhitespace appendTrailingWhitespace) {
   Node* innerNode = result.innerNode();
   VisibleSelectionInFlatTree newSelection;
 
   if (!innerNode || !innerNode->layoutObject())
     return;
@@ skipping 13 matching lines @@
       newSelection = createVisibleSelection(start, end);
     }
   }
 
   if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend &&
       newSelection.isRange())
     newSelection.appendTrailingWhitespace();
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
-      WordGranularity);
+      WordGranularity, HandleVisibility::NotVisible);
 }
 
 void SelectionController::selectClosestWordFromMouseEvent(
     const MouseEventWithHitTestResults& result) {
   if (!m_mouseDownMayStartSelect)
     return;
 
   AppendTrailingWhitespace appendTrailingWhitespace =
       (result.event().clickCount() == 2 &&
        m_frame->editor().isSelectTrailingWhitespaceEnabled())
@@ skipping 35 matching lines @@
   Element* URLElement = result.hitTestResult().URLElement();
   const VisiblePositionInFlatTree pos =
       visiblePositionOfHitTestResult(result.hitTestResult());
   if (pos.isNotNull() &&
       pos.deepEquivalent().anchorNode()->isDescendantOf(URLElement))
     newSelection =
         VisibleSelectionInFlatTree::selectionFromContentsOfNode(URLElement);
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
-      WordGranularity);
+      WordGranularity, HandleVisibility::NotVisible);
 }
 
 bool SelectionController::handleMousePressEventDoubleClick(
     const MouseEventWithHitTestResults& event) {
   TRACE_EVENT0("blink",
                "SelectionController::handleMousePressEventDoubleClick");
 
   if (!selection().isAvailable())
     return false;
 
@@ skipping 41 matching lines @@
   VisibleSelectionInFlatTree newSelection;
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   if (pos.isNotNull()) {
     SelectionInFlatTree::Builder builder;
     builder.collapse(pos.toPositionWithAffinity());
     newSelection = createVisibleSelection(builder.build());
     newSelection.expandUsingGranularity(ParagraphGranularity);
   }
 
+  bool isHandleVisible = event.event().fromTouch() && newSelection.isRange();
+
   return updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
-      ParagraphGranularity);
+      ParagraphGranularity, isHandleVisible ? HandleVisibility::Visible
+                                            : HandleVisibility::NotVisible);
 }
 
 void SelectionController::handleMousePressEvent(
     const MouseEventWithHitTestResults& event) {
   // If we got the event back, that must mean it wasn't prevented,
   // so it's allowed to start a drag or selection if it wasn't in a scrollbar.
   m_mouseDownMayStartSelect =
       (canMouseDownStartSelect(event.innerNode()) || isLinkSelection(event)) &&
       !event.scrollbar();
   m_mouseDownWasSingleClickInSelection = false;
@@ skipping 177 matching lines @@
                      pos.deepEquivalent().parentAnchoredEquivalent()),
                  DocumentMarker::MisspellingMarkers())
              .size() > 0;
 }
 
 void SelectionController::sendContextMenuEvent(
     const MouseEventWithHitTestResults& mev,
     const LayoutPoint& position) {
   if (!selection().isAvailable())
     return;
-  if (selection().contains(position) || mev.scrollbar() ||
+  if (selection().contains(mev.hitTestResult()) || mev.scrollbar() ||
       // FIXME: In the editable case, word selection sometimes selects content
       // that isn't underneath the mouse.
       // If the selection is non-editable, we do word selection to make it
       // easier to use the contextual menu items available for text selections.
       // But only if we're above text.
       !(selection().isContentEditable() ||
         (mev.innerNode() && mev.innerNode()->isTextNode())))
     return;
 
   // Context menu events are always allowed to perform a selection.
   AutoReset<bool> mouseDownMayStartSelectChange(&m_mouseDownMayStartSelect,
                                                 true);
 
   if (hitTestResultIsMisspelled(mev.hitTestResult()))
     return selectClosestMisspellingFromMouseEvent(mev);
 
   if (!m_frame->editor().behavior().shouldSelectOnContextualMenuClick())
     return;
 
   selectClosestWordOrLinkFromMouseEvent(mev);
 }
 
 void SelectionController::passMousePressEventToSubframe(
     const MouseEventWithHitTestResults& mev) {
   // If we're clicking into a frame that is selected, the frame will appear
   // greyed out even though we're clicking on the selection.  This looks
   // really strange (having the whole frame be greyed out), so we deselect the
   // selection.
-  IntPoint p = m_frame->view()->rootFrameToContents(mev.event().position());
-  if (!selection().contains(p))
+  if (!selection().contains(mev.hitTestResult()))
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   const VisiblePositionInFlatTree& visiblePos =
       visiblePositionOfHitTestResult(mev.hitTestResult());
   if (visiblePos.isNull()) {
     selection().setSelection(VisibleSelectionInFlatTree());
@@ skipping 37 matching lines @@
   return event.event().altKey() && event.isOverLink();
 }
 
 bool isExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool isMouseDownOnLinkOrImage =
       event.isOverLink() || event.hitTestResult().image();
   return event.event().shiftKey() && !isMouseDownOnLinkOrImage;
 }
 
 }  // namespace blink