Changeset 155519 in webkit

Timestamp:

Sep 11, 2013 4:44:58 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

Mouseenter/-leave not triggered when element under cursor is moved/removed
​https://bugs.webkit.org/show_bug.cgi?id=120786

Reviewed by Antonio Gomes.

Source/WebCore:

When a hovered element is detached it will now emit a fake mousemove event
similar to what happens when a hovered element has CSS display set to none.

Test: fast/events/mouseenterleave-detached-element.html

• dom/Document.cpp:

(WebCore::Document::hoveredElementDidDetach):

• page/EventHandler.cpp:

(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::clear):
(WebCore::EventHandler::handleMouseMoveEvent):

• page/EventHandler.h:

LayoutTests:

Test of mouseenter/mouseleave events when a hovered element is removed.

• fast/events/mouseenterleave-detached-element-expected.txt: Added.
• fast/events/mouseenterleave-detached-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/mouseenterleave-detached-element-expected.txt (added)
• LayoutTests/fast/events/mouseenterleave-detached-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (5 diffs)
• Source/WebCore/page/EventHandler.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Mouseenter/-leave not triggered when element under cursor is moved/removed
+        https://bugs.webkit.org/show_bug.cgi?id=120786
+
+        Reviewed by Antonio Gomes.
+
+        Test of mouseenter/mouseleave events when a hovered element is removed.
+
+        * fast/events/mouseenterleave-detached-element-expected.txt: Added.
+        * fast/events/mouseenterleave-detached-element.html: Added.
+
 2013-09-11  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-11  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Mouseenter/-leave not triggered when element under cursor is moved/removed
+        https://bugs.webkit.org/show_bug.cgi?id=120786
+
+        Reviewed by Antonio Gomes.
+
+        When a hovered element is detached it will now emit a fake mousemove event
+        similar to what happens when a hovered element has CSS display set to none.
+
+        Test: fast/events/mouseenterleave-detached-element.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::hoveredElementDidDetach):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::EventHandler):
+        (WebCore::EventHandler::clear):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        * page/EventHandler.h:
+
 2013-09-11  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3270 +3270 @@
         return;
 
-    m_hoveredElement = element->parentElement();
-    while (m_hoveredElement && !m_hoveredElement->renderer())
-        m_hoveredElement = m_hoveredElement->parentElement();
+    RenderObject* hoverAncestor = element->renderer()->hoverAncestor();
+    if (hoverAncestor && hoverAncestor->node() && hoverAncestor->node()->isElementNode())
+        m_hoveredElement = toElement(hoverAncestor->node());
+    else
+        m_hoveredElement = 0;
+
     if (frame())
-        frame()->eventHandler().scheduleHoverStateUpdate();
+        frame()->eventHandler().dispatchFakeMouseMoveEventSoon();
 }
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -320 +320 @@
     , m_mouseDownWasSingleClickInSelection(false)
     , m_selectionInitiationState(HaveNotStartedSelection)
-    , m_hoverTimer(this, &EventHandler::hoverTimerFired)
     , m_cursorUpdateTimer(this, &EventHandler::cursorUpdateTimerFired)
     , m_autoscrollController(adoptPtr(new AutoscrollController))
@@ -378 +377 @@
 void EventHandler::clear()
 {
-    m_hoverTimer.stop();
     m_cursorUpdateTimer.stop();
     m_fakeMouseMoveEventTimer.stop();
@@ -1733 +1731 @@
     setLastKnownMousePosition(mouseEvent);
 
-    if (m_hoverTimer.isActive())
-        m_hoverTimer.stop();
-
     m_cursorUpdateTimer.stop();
 
@@ -3102 +3097 @@
 #endif // ENABLE(CONTEXT_MENUS)
 
-void EventHandler::scheduleHoverStateUpdate()
-{
-    if (!m_hoverTimer.isActive())
-        m_hoverTimer.startOneShot(0);
-}
-
 void EventHandler::scheduleCursorUpdate()
 {
@@ -3189 +3178 @@
     ASSERT(m_resizeLayer);
     m_resizeLayer = 0;
-}
-
-void EventHandler::hoverTimerFired(Timer<EventHandler>*)
-{
-    m_hoverTimer.stop();
-
-    ASSERT(m_frame.document());
-
-    if (RenderView* renderer = m_frame.contentRenderer()) {
-        if (FrameView* view = m_frame.view()) {
-            HitTestRequest request(HitTestRequest::Move | HitTestRequest::DisallowShadowContent);
-            HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
-            renderer->hitTest(request, result);
-            m_frame.document()->updateHoverActiveState(request, result.innerElement());
-        }
-    }
 }
 

trunk/Source/WebCore/page/EventHandler.h

@@ -288 +288 @@
     OptionalCursor selectCursor(const HitTestResult&, bool shiftKey);
 
-    void hoverTimerFired(Timer<EventHandler>*);
     void cursorUpdateTimerFired(Timer<EventHandler>*);
 
@@ -431 +430 @@
     bool m_panScrollButtonPressed;
 
-    Timer<EventHandler> m_hoverTimer;
     Timer<EventHandler> m_cursorUpdateTimer;