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);
 
+  VisibleSelectionInFlatTree newSelection =
+      selection().visibleSelection<EditingInFlatTreeStrategy>();
+
   // 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;
+  if (!extendSelection && selection().contains(event.hitTestResult())) {
+    m_mouseDownWasSingleClickInSelection = true;
+    if (!event.event().fromTouch())
       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;
 
-  if (extendSelection && !newSelection.isNone()) {
+  if (mouseDownWasSingleClickInSelection() && !newSelection.isHandleVisible()) {
+    newSelection.setIsHandleVisible(true);
+  } else if (extendSelection && !newSelection.isNone()) {
     const VisibleSelectionInFlatTree selectionInUserSelectAll(
         expandSelectionToRespectUserSelectAll(innerNode,
                                               createVisibleSelection(pos)));
     if (selectionInUserSelectAll.isRange()) {
       if (selectionInUserSelectAll.start().compareTo(newSelection.start()) < 0)
         pos = selectionInUserSelectAll.start();
       else if (newSelection.end().compareTo(selectionInUserSelectAll.end()) < 0)
         pos = selectionInUserSelectAll.end();
     }
 
@@ skipping 14 matching lines @@
       newSelection.setExtent(pos);
     }
 
     if (selection().granularity() != CharacterGranularity) {
       granularity = selection().granularity();
       newSelection.expandUsingGranularity(selection().granularity());
     }
   } else if (m_selectionState != SelectionState::ExtendedSelection) {
     newSelection = expandSelectionToRespectUserSelectAll(
         innerNode, createVisibleSelection(visiblePos));
+    if (newSelection.isContentEditable()) {
+      bool isTextBoxEmpty =
+          VisibleSelection::selectionFromContentsOfNode(innerNode).isCaret();
+      bool notLeftClick = event.event().pointerProperties().button !=
+                          WebPointerProperties::Button::Left;
+      if (!isTextBoxEmpty || notLeftClick)
+        newSelection.setIsHandleVisible(event.event().fromTouch());

[aelias_OOO_until_Jul13, 2016/10/07 02:40:20]

Can you add a test that handles are *not* created for mouse events?

[amaralp, 2016/10/14 00:53:07]

Added to EventHandlerTest.cpp

+    }
   }
 
   // Updating the selection is considered side-effect of the event and so it
   // doesn't impact the handled state.
   updateSelectionForMouseDownDispatchingSelectStart(innerNode, newSelection,
                                                     granularity);
   return false;
 }
 
 void SelectionController::updateSelectionForMouseDrag(
@@ skipping 183 matching lines @@
                              : TextIteratorDefaultBehavior);
     if (str.isEmpty() || str.simplifyWhiteSpace().containsOnlyWhitespace())
       return;
 
     if (newSelection.rootEditableElement() &&
         pos.deepEquivalent() ==
             VisiblePositionInFlatTree::lastPositionInNode(
                 newSelection.rootEditableElement())
                 .deepEquivalent())
       return;
+    newSelection.setIsHandleVisible(true);
   }
 
   if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend &&
       newSelection.isRange())
     newSelection.appendTrailingWhitespace();
 
   updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       WordGranularity);
 }
@@ skipping 138 matching lines @@
     return false;
 
   VisibleSelectionInFlatTree newSelection;
   const VisiblePositionInFlatTree& pos =
       visiblePositionOfHitTestResult(event.hitTestResult());
   if (pos.isNotNull()) {
     newSelection = createVisibleSelection(pos);
     newSelection.expandUsingGranularity(ParagraphGranularity);
   }
 
+  newSelection.setIsHandleVisible(event.event().fromTouch() &&
+                                  newSelection.isRange());
+
   return updateSelectionForMouseDownDispatchingSelectStart(
       innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection),
       ParagraphGranularity);
 }
 
 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 =
@@ skipping 146 matching lines @@
 
   Node* innerNode = hitTestResult.innerNode();
   if (!innerNode)
     return false;
   innerNode->document().updateStyleAndLayoutTree();
   bool innerNodeIsSelectable =
       hasEditableStyle(*innerNode) || innerNode->canStartSelection();
   if (!innerNodeIsSelectable)
     return false;
 
+  // If longpress occurs inside of a selection that doesn't have handles
+  // then we want to show the handes on the entire selection.
+  VisibleSelectionInFlatTree newSelection =
+      selection().visibleSelection<EditingInFlatTreeStrategy>();
+  if (selection().contains(hitTestResult) && !newSelection.isHandleVisible()) {
+    newSelection.setIsHandleVisible(true);
+    selection().setNonDirectionalSelectionIfNeeded(newSelection,
+                                                   selection().granularity());
+    return true;
+  }
+
   selectClosestWordFromHitTestResult(hitTestResult,
                                      AppendTrailingWhitespace::DontAppend,
                                      SelectInputEventType::Touch);
   if (!selection().isAvailable()) {
     // "editing/selection/longpress-selection-in-iframe-removed-crash.html"
     // reach here.
     return false;
   }
   return selection().isRange();
 }
@@ skipping 13 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());
   VisibleSelectionInFlatTree newSelection = createVisibleSelection(visiblePos);
   selection().setSelection(newSelection);
@@ skipping 32 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