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 140 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;
-  setSelection(createVisibleSelection(pos, pos, selection().isDirectional()),
+  bool isHandleVisible = userTriggered == UserTriggered;
+  setSelection(createVisibleSelection(pos, pos, selection().isDirectional(),
+                                      isHandleVisible),
                options, align);
 }
 
 void FrameSelection::moveTo(const Position& pos, TextAffinity affinity) {
   SetSelectionOptions options = CloseTyping | ClearTypingStyle;
   setSelection(
       createVisibleSelection(pos, affinity, selection().isDirectional()),
       options);
 }
 
@@ skipping 636 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 131 matching lines @@
                                       SetSelectionOptions options) {
   if (range.isNull())
     return false;
   m_selectionEditor->resetLogicalRange();
   // Since |FrameSeleciton::setSelection()| dispatches events and DOM tree
   // can be modified by event handlers, we should create |Range| object before
   // calling it.
   Range* logicalRange = createRange(range);
   VisibleSelection newSelection = createVisibleSelection(
       range.startPosition(), range.endPosition(), affinity,
-      directional == SelectionDirectionalMode::Directional);
+      directional == SelectionDirectionalMode::Directional,
+      selection().isHandleVisible());
   setSelection(newSelection, options);
   m_selectionEditor->setLogicalRange(logicalRange);
   return true;
 }
 
 Range* FrameSelection::firstRange() const {
   return m_selectionEditor->firstRange();
 }
 
 bool FrameSelection::isInPasswordField() const {
@@ skipping 377 matching lines @@
 
 bool FrameSelection::selectWordAroundPosition(const VisiblePosition& position) {
   static const EWordSide wordSideList[2] = {RightWordIfOnBoundary,
                                             LeftWordIfOnBoundary};
   for (EWordSide wordSide : wordSideList) {
     VisiblePosition start = startOfWord(position, wordSide);
     VisiblePosition end = endOfWord(position, wordSide);
     String text =
         plainText(EphemeralRange(start.deepEquivalent(), end.deepEquivalent()));
     if (!text.isEmpty() && !isSeparator(text.characterStartingAt(0))) {
-      setSelection(createVisibleSelection(start, end), WordGranularity);
+      VisibleSelection newSelection = createVisibleSelection(start, end);
+      newSelection.setIsHandleVisible(selection().isHandleVisible());
+      setSelection(newSelection, WordGranularity);
       return true;
     }
   }
 
   return false;
 }
 
 GranularityStrategy* FrameSelection::granularityStrategy() {
   // We do lazy initalization for m_granularityStrategy, because if we
   // initialize it right in the constructor - the correct settings may not be
@@ skipping 12 matching lines @@
     m_granularityStrategy = wrapUnique(new CharacterGranularityStrategy());
   return m_granularityStrategy.get();
 }
 
 void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
   if (isNone())
     return;
 
   VisibleSelection newSelection =
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
+  newSelection.setIsHandleVisible(
+      m_selectionEditor->visibleSelection<EditingStrategy>().isHandleVisible());
   setSelection(newSelection,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
                    FrameSelection::DoNotClearStrategy | UserTriggered,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
 void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
                                         const VisiblePosition& extentPosition,
                                         TextGranularity granularity) {
   VisibleSelection newSelection =
       createVisibleSelection(basePosition, extentPosition);
+  newSelection.setIsHandleVisible(
+      m_selectionEditor->visibleSelection<EditingStrategy>().isHandleVisible());
   newSelection.expandUsingGranularity(granularity);
 
   if (newSelection.isNone())
     return;
 
   setSelection(newSelection, granularity);
 }
 
 void FrameSelection::updateIfNeeded() {
   m_selectionEditor->updateIfNeeded();
@@ skipping 37 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif