Prune HitTestResult and stop special-casing links.

sky/engine/core/page/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
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 201 matching lines @@
     if (!m_frame->contentRenderer() || !m_frame->view() || !m_frame->view()->didFirstLayout())
         return result;
 
     // hitTestResultAtPoint is specifically used to hitTest into all frames, thus it always allows child frame content.
     HitTestRequest request(hitType);
     m_frame->contentRenderer()->hitTest(request, result);
 
     return result;
 }
 
-bool EventHandler::useHandCursor(Node* node, bool isOverLink)
-{
-    if (!node)
-        return false;
-
-    return isOverLink && !node->hasEditableStyle();
-}
-
 void EventHandler::cursorUpdateTimerFired(Timer<EventHandler>*)
 {
     ASSERT(m_frame);
     ASSERT(m_frame->document());
 
     updateCursor();
 }
 
 void EventHandler::updateCursor()
 {
 }
 
 OptionalCursor EventHandler::selectCursor(const HitTestResult& result)
 {
     Page* page = m_frame->page();
     if (!page)
         return NoCursorChange;
 
     Node* node = result.innerPossiblyPseudoNode();
     if (!node)
-        return selectAutoCursor(result, node, iBeamCursor());
+        return selectAutoCursor(result, node);
 
     RenderObject* renderer = node->renderer();
     RenderStyle* style = renderer ? renderer->style() : 0;
 
     if (renderer) {
         Cursor overrideCursor;
         switch (renderer->getCursor(roundedIntPoint(result.localPoint()), overrideCursor)) {
         case SetCursorBasedOnStyle:
             break;
         case SetCursor:
@@ skipping 28 matching lines @@
             Image* image = cachedImage->imageForRenderer(renderer);
             // Ensure no overflow possible in calculations above.
             if (scale < minimumCursorScale)
                 continue;
             return Cursor(image, hotSpot, scale);
         }
     }
 
     switch (style ? style->cursor() : CURSOR_AUTO) {
     case CURSOR_AUTO: {
-        const Cursor& iBeam = iBeamCursor();
-        return selectAutoCursor(result, node, iBeam);
+        return selectAutoCursor(result, node);
     }
     case CURSOR_CROSS:
         return crossCursor();
     case CURSOR_POINTER:
         return handCursor();
     case CURSOR_MOVE:
         return moveCursor();
     case CURSOR_ALL_SCROLL:
         return moveCursor();
     case CURSOR_E_RESIZE:
@@ skipping 55 matching lines @@
     case CURSOR_ZOOM_OUT:
         return zoomOutCursor();
     case CURSOR_WEBKIT_GRAB:
         return grabCursor();
     case CURSOR_WEBKIT_GRABBING:
         return grabbingCursor();
     }
     return pointerCursor();
 }
 
-OptionalCursor EventHandler::selectAutoCursor(const HitTestResult& result, Node* node, const Cursor& iBeam)
+OptionalCursor EventHandler::selectAutoCursor(const HitTestResult& result, Node* node)
 {
-    bool editable = (node && node->hasEditableStyle());
-
-    if (useHandCursor(node, result.isOverLink()))
-        return handCursor();
-
     RenderObject* renderer = node ? node->renderer() : 0;
-    if (editable || (renderer && renderer->isText() && node->canStartSelection()))
-        return iBeam;
+    if (!node || !renderer)
+        return pointerCursor();
+    if (node->hasEditableStyle() || (renderer->isText() && node->canStartSelection()))
+        return iBeamCursor();
     return pointerCursor();
 }
 
 void EventHandler::invalidateClick()
 {
     m_clickCount = 0;
     m_clickNode = nullptr;
 }
 
 void EventHandler::scheduleCursorUpdate()
@@ skipping 139 matching lines @@
 
 void EventHandler::focusDocumentView()
 {
     Page* page = m_frame->page();
     if (!page)
         return;
     page->focusController().focusDocumentView(m_frame);
 }
 
 } // namespace blink