Blink handle selection handle visibility

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

Index: third_party/WebKit/Source/core/editing/FrameSelection.cpp
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.cpp b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
index 640f1249421f1a3cec7f4b07b00a8e7f40253a7c..04093631b79891335b381748b48e17431016ca44 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.cpp
@@ -166,7 +166,8 @@ void FrameSelection::moveCaretSelection(const IntPoint& point) {
   builder.setIsDirectional(selection().isDirectional());
   if (position.isNotNull())
     builder.collapse(position.toPositionWithAffinity());
-  setSelection(builder.build(), CloseTyping | ClearTypingStyle | UserTriggered);
+  setSelection(builder.build(),
+               CloseTyping | ClearTypingStyle | UserTriggered | HandleVisible);
 }
 
 template <typename Strategy>
@@ -183,6 +184,9 @@ void FrameSelection::setSelectionAlgorithm(
     m_granularityStrategy->Clear();
   bool closeTyping = options & CloseTyping;
   bool shouldClearTypingStyle = options & ClearTypingStyle;
+  const HandleVisibility handleVisibility = options & HandleVisible
+                                                ? HandleVisibility::Visible
+                                                : HandleVisibility::NotVisible;
   EUserTriggered userTriggered = selectionOptionsToUserTriggered(options);
 
   // TODO(editing-dev): We should rename variable |s| to another name to avoid
@@ -201,7 +205,8 @@ void FrameSelection::setSelectionAlgorithm(
   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();
@@ -213,6 +218,7 @@ void FrameSelection::setSelectionAlgorithm(
       visibleSelection<Strategy>();
   const Position& oldSelectionStart = selection().start();
 
+  m_handleVisibility = handleVisibility;
   m_selectionEditor->setVisibleSelection(s, options);
   m_frameCaret->setCaretRectNeedsUpdate();
 
@@ -743,19 +749,13 @@ void FrameSelection::paintCaret(GraphicsContext& context,
   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;
@@ -778,6 +778,17 @@ bool FrameSelection::contains(const LayoutPoint& point) {
   return start.compareTo(pos) <= 0 && pos.compareTo(end) <= 0;
 }
 
+bool FrameSelection::contains(const LayoutPoint& pointInContent) {

[yosin_UTC9, 2016/11/24 02:29:04]

Could you move |FrameSelection::contains()| changes to another patch to explain
specific motivation of this change?

+  if (document().layoutViewItem().isNull())
+    return false;
+
+  HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
+  HitTestResult result(request, pointInContent);
+  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
@@ -1337,7 +1348,8 @@ void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
   setSelection(newSelection,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
-                   FrameSelection::DoNotClearStrategy | UserTriggered,
+                   FrameSelection::DoNotClearStrategy | UserTriggered |
+                   FrameSelection::HandleVisible,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
@@ -1358,8 +1370,11 @@ void FrameSelection::moveRangeSelection(const VisiblePosition& basePosition,
   if (newSelection.isNone())
     return;
 
-  setSelection(newSelection, CloseTyping | ClearTypingStyle,
-               CursorAlignOnScroll::IfNeeded, granularity);
+  SetSelectionOptions options = CloseTyping | ClearTypingStyle;
+  if (isHandleVisible())
+    options |= HandleVisible;
+  setSelection(newSelection, options, CursorAlignOnScroll::IfNeeded,
+               granularity);
 }
 
 void FrameSelection::updateIfNeeded() {