Changeset 102632 in webkit

Timestamp:

Dec 12, 2011 3:51:03 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

When the mouse is dragged out of an :active element, it should lose :hover.
​https://bugs.webkit.org/show_bug.cgi?id=57206

Patch by Jeremy Apthorp <​jeremya@chromium.org> on 2011-12-12
Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/css/hover-active-drag.html

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseMoveEvent): Don't mark mouse-drag hit tests read-only, since they no longer are.
(WebCore::EventHandler::dragSourceEndedAt): Send a hit test request when the mouse goes up after a drag, so
RenderLayer has a chance to update the hover/active status.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateHoverActiveState): Only allow the :active state to change on mouse down or mouse up.

LayoutTests:

• fast/css/hover-active-drag-expected.txt: Added.
• fast/css/hover-active-drag.html: Added.
• platform/mac/fast/css/hover-active-drag-expected.txt: Removed.
• platform/chromium/fast/css/hover-active-drag-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/hover-active-drag-expected.txt (moved) (moved from trunk/LayoutTests/platform/chromium/fast/css/hover-active-drag-expected.txt)
• LayoutTests/fast/css/hover-active-drag.html (added)
• LayoutTests/platform/mac/fast/css/hover-active-drag-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-12  Jeremy Apthorp  <jeremya@chromium.org>
+
+        When the mouse is dragged out of an :active element, it should lose :hover.
+        https://bugs.webkit.org/show_bug.cgi?id=57206
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/css/hover-active-drag-expected.txt: Added.
+        * fast/css/hover-active-drag.html: Added.
+        * platform/mac/fast/css/hover-active-drag-expected.txt: Removed.
+        * platform/chromium/fast/css/hover-active-drag-expected.txt: Removed.
+
 2011-12-12  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-12  Jeremy Apthorp  <jeremya@chromium.org>
+
+        When the mouse is dragged out of an :active element, it should lose :hover.
+        https://bugs.webkit.org/show_bug.cgi?id=57206
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/css/hover-active-drag.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseMoveEvent): Don't mark mouse-drag hit tests read-only, since they no longer are.
+        (WebCore::EventHandler::dragSourceEndedAt): Send a hit test request when the mouse goes up after a drag, so
+        RenderLayer has a chance to update the hover/active status.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateHoverActiveState): Only allow the :active state to change on mouse down or mouse up.
+
 2011-12-12  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1613 +1613 @@
         return m_lastScrollbarUnderMouse->mouseMoved(mouseEvent);
 
-    // Mouse events should be treated as "read-only" in prepareMouseEvent if the mouse is 
-    // pressed and we are allowed to select OR if we're updating only scrollbars. This 
-    // means that :hover and :active freeze in the state they were in, rather than updating 
-    // for nodes the mouse moves over while you hold the mouse down (in the mouse pressed case)
-    // or while the window is not key (as in the onlyUpdateScrollbars case).
     HitTestRequest::HitTestRequestType hitType = HitTestRequest::MouseMove;
-    if ((m_mousePressed && m_mouseDownMayStartSelect) || onlyUpdateScrollbars)
-        hitType |= HitTestRequest::ReadOnly;
     if (m_mousePressed)
         hitType |= HitTestRequest::Active;
@@ -2762 +2755 @@
 void EventHandler::dragSourceEndedAt(const PlatformMouseEvent& event, DragOperation operation)
 {
+    // Send a hit test request so that RenderLayer gets a chance to update the :hover and :active pseudoclasses.
+    HitTestRequest request(HitTestRequest::MouseUp);
+    prepareMouseEvent(request, event);
+
     if (dragState().m_dragSrc && dragState().shouldDispatchEvents()) {
         dragState().m_dragClipboard->setDestinationOperation(operation);

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3979 +3979 @@
         // We are clearing the :active chain because the mouse has been released.
         for (RenderObject* curr = activeNode->renderer(); curr; curr = curr->parent()) {
-            if (curr->node() && !curr->isText())
+            if (curr->node() && !curr->isText()) {
+                curr->node()->setActive(false);
                 curr->node()->clearInActiveChain();
+            }
         }
         doc->setActiveNode(0);
@@ -3996 +3998 @@
         }
     }
+    // If the mouse has just been pressed, set :active on the chain. Those (and only those)
+    // nodes should remain :active until the mouse is released.
+    bool allowActiveChanges = !activeNode && doc->activeNode();
 
     // If the mouse is down and if this is a mouse move event, we want to restrict changes in 
@@ -4038 +4043 @@
     size_t removeCount = nodesToRemoveFromChain.size();
     for (size_t i = 0; i < removeCount; ++i) {
-        nodesToRemoveFromChain[i]->setActive(false);
         nodesToRemoveFromChain[i]->setHovered(false);
     }
@@ -4044 +4048 @@
     size_t addCount = nodesToAddToChain.size();
     for (size_t i = 0; i < addCount; ++i) {
-        nodesToAddToChain[i]->setActive(request.active());
+        if (allowActiveChanges)
+            nodesToAddToChain[i]->setActive(true);
         nodesToAddToChain[i]->setHovered(true);
     }