Cleanup determining ibeam for node.

third_party/WebKit/Source/core/input/EventHandler.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)
  *
  * 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 100 matching lines @@
 // EventHandler::handleMousePressEvent to pass the event to the FrameViewBase
 // and thus the event target node can't still be the shadow node.
 bool ShouldRefetchEventTarget(const MouseEventWithHitTestResults& mev) {
   Node* target_node = mev.InnerNode();
   if (!target_node || !target_node->parentNode())
     return true;
   return target_node->IsShadowRoot() &&
          isHTMLInputElement(ToShadowRoot(target_node)->host());
 }
 
+bool ShowIBeamForNode(const Node* node, const HitTestResult& result) {

[jbroman, 2017/04/28 15:35:48]

nit: not clear if this function shows it or is simply a policy method; consider
"ShouldShowIBeamForNode" or similar?

[dtapuska, 2017/04/28 15:47:35]

Done.

+  if (!node || result.GetScrollbar())

[jbroman, 2017/04/28 15:35:48]

nit: the caller already checks for GetScrollbar, I think?

[dtapuska, 2017/04/28 15:47:35]

Done.

+    return false;
+
+  bool layout_object_selectable = false;
+  if (LayoutObject* layout_object = node->GetLayoutObject()) {
+    PaintLayer* layer = layout_object->EnclosingLayer();
+    if (layer->GetScrollableArea() &&
+        layer->GetScrollableArea()->IsPointInResizeControl(
+            result.RoundedPointInMainFrame(), kResizerForPointer)) {
+      return false;
+    }
+
+    layout_object_selectable =
+        layout_object->IsText() && node->CanStartSelection();
+  }
+
+  return HasEditableStyle(*node) || layout_object_selectable;
+}
+
 }  // namespace
 
 using namespace HTMLNames;
 
 // The amount of time to wait for a cursor update on style and layout changes
 // Set to 50Hz, no need to be faster than common screen refresh rate
 static const double kCursorUpdateInterval = 0.02;
 
 static const int kMaximumCursorSize = 128;
 
@@ skipping 399 matching lines @@
   return PointerCursor();
 }
 
 OptionalCursor EventHandler::SelectAutoCursor(const HitTestResult& result,
                                               Node* node,
                                               const Cursor& i_beam) {
   if (result.GetScrollbar()) {
     return PointerCursor();
   }
 
-  bool editable = (node && HasEditableStyle(*node));
-
   const bool is_over_link =
       !GetSelectionController().MouseDownMayStartSelect() &&
       result.IsOverLink();
   if (UseHandCursor(node, is_over_link))
     return HandCursor();
 
-  bool in_resizer = false;
-  LayoutObject* layout_object = node ? node->GetLayoutObject() : nullptr;
-  if (layout_object && frame_->View()) {
-    PaintLayer* layer = layout_object->EnclosingLayer();
-    in_resizer = layer->GetScrollableArea() &&
-                 layer->GetScrollableArea()->IsPointInResizeControl(
-                     result.RoundedPointInMainFrame(), kResizerForPointer);
-  }
-
   // During selection, use an I-beam no matter what we're over.
   // If a drag may be starting or we're capturing mouse events for a particular
   // node, don't treat this as a selection.
   if (mouse_event_manager_->MousePressed() &&

[jbroman, 2017/04/28 15:35:49]

nit: consider comment that this causes layout to avoid reintroducing the issue
(but maybe want to be suitably vague)?

[dtapuska, 2017/04/28 15:47:35]

Done.

       GetSelectionController().MouseDownMayStartSelect() &&
       !mouse_event_manager_->MouseDownMayStartDrag() &&
       !frame_->Selection()
            .ComputeVisibleSelectionInDOMTreeDeprecated()
            .IsNone() &&
       !capturing_mouse_events_node_) {
     return i_beam;
   }
 
-  if ((editable || (layout_object && layout_object->IsText() &&
-                    node->CanStartSelection())) &&
-      !in_resizer && !result.GetScrollbar())
+  if (ShowIBeamForNode(node, result))
     return i_beam;
   return PointerCursor();
 }
 
 WebInputEventResult EventHandler::HandleMousePressEvent(
     const WebMouseEvent& mouse_event) {
   TRACE_EVENT0("blink", "EventHandler::handleMousePressEvent");
 
   // For 4th/5th button in the mouse since Chrome does not yet send
   // button value to Blink but in some cases it does send the event.
@@ skipping 1526 matching lines @@
     MouseEventWithHitTestResults& mev,
     LocalFrame* subframe) {
   WebInputEventResult result =
       subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event());
   if (result != WebInputEventResult::kNotHandled)
     return result;
   return WebInputEventResult::kHandledSystem;
 }
 
 }  // namespace blink