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:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 114 matching lines @@
     TRACE_EVENT0("blink", "SelectionController::handleMousePressEventSingleClick");
 
     m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
     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;
-            return false;
+            if (newSelection.isHandleVisible() || !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.setIsHandleVisible(true);
+    } else if (extendSelection && !newSelection.isNone()) {
         const VisibleSelectionInFlatTree selectionInUserSelectAll(expandSelectionToRespectUserSelectAll(innerNode, VisibleSelectionInFlatTree(createVisiblePosition(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();
         }
 
         if (!m_frame->editor().behavior().shouldConsiderSelectionAsDirectional()) {
             if (pos.isNotNull()) {
@@ skipping 11 matching lines @@
         } else {
             newSelection.setExtent(pos);
         }
 
         if (selection().granularity() != CharacterGranularity) {
             granularity = selection().granularity();
             newSelection.expandUsingGranularity(selection().granularity());
         }
     } else if (m_selectionState != SelectionState::ExtendedSelection) {
         newSelection = expandSelectionToRespectUserSelectAll(innerNode, VisibleSelectionInFlatTree(visiblePos));
+        if (newSelection.isContentEditable()) {
+            bool isTextBoxEmpty = VisibleSelection::selectionFromContentsOfNode(innerNode).isCaret();
+            bool isRightClick = event.event().button() == RightButton;
+            if (!isTextBoxEmpty || isRightClick)
+                newSelection.setIsHandleVisible(event.event().fromTouch());

[aelias_OOO_until_Jul13, 2016/08/08 21:30:51]

The changes in this file are intentionally changing/introducing new behavior, so
could you write a few unit tests for the cases you care about?

+        }
     }
 
     // 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(const HitTestResult& hitTestResult, Node* mousePressNode, const LayoutPoint& dragStartPos, const IntPoint& lastKnownMousePosition)
 {
     if (!m_mouseDownMayStartSelect)
@@ skipping 123 matching lines @@
     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;
+        newSelection.setIsHandleVisible(true);
     }
 
     if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
         newSelection.appendTrailingWhitespace();
 
     updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestMisspellingFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
 {
@@ skipping 105 matching lines @@
     if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))
         return false;
 
     VisibleSelectionInFlatTree newSelection;
     const VisiblePositionInFlatTree& pos = visiblePositionOfHitTestResult(event.hitTestResult());
     if (pos.isNotNull()) {
         newSelection = VisibleSelectionInFlatTree(pos);
         newSelection.expandUsingGranularity(ParagraphGranularity);
     }
 
+    newSelection.setIsHandleVisible(event.event().fromTouch());
+
     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 = (canMouseDownStartSelect(event.innerNode()) || isLinkSelection(event))
         && !event.scrollbar();
     m_mouseDownWasSingleClickInSelection = false;
@@ skipping 114 matching lines @@
         return false;
     if (hitTestResult.isLiveLink())
         return false;
 
     Node* innerNode = hitTestResult.innerNode();
     innerNode->document().updateStyleAndLayoutTree();
     bool innerNodeIsSelectable = innerNode && (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.
+    if (FrameView* view = m_frame->view()) {
+        LayoutPoint vPoint = view->rootFrameToContents(gestureEvent.position());
+        VisibleSelectionInFlatTree newSelection = selection().visibleSelection<EditingInFlatTreeStrategy>();
+        if (selection().contains(vPoint) && !newSelection.isHandleVisible()) {

[aelias_OOO_until_Jul13, 2016/08/08 21:30:51]

FrameSelection::contains() performs another hit test, but you have a
HitTestResult in this method already.  Please just do the same comparison as the
last line of FrameSelection::contains() with the existing HitTestResult.

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

Done.

+            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();
 }
 
 void SelectionController::sendContextMenuEvent(const MouseEventWithHitTestResults& mev, const LayoutPoint& position)
@@ skipping 75 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