Changeset 102425 in webkit

Timestamp:

Dec 8, 2011 8:22:14 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r101619.
​http://trac.webkit.org/changeset/101619
​https://bugs.webkit.org/show_bug.cgi?id=74158

this patch produces bad behaviour on mac (Requested by
jeremya_ on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-12-08

Source/WebCore:

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseMoveEvent):
(WebCore::EventHandler::dragSourceEndedAt):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateHoverActiveState):

LayoutTests:

• fast/css/hover-active-drag-expected.txt: Removed.
• fast/css/hover-active-drag.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/hover-active-drag-expected.txt (deleted)
• LayoutTests/fast/css/hover-active-drag.html (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-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101619.
+        http://trac.webkit.org/changeset/101619
+        https://bugs.webkit.org/show_bug.cgi?id=74158
+
+        this patch produces bad behaviour on mac (Requested by
+        jeremya_ on #webkit).
+
+        * fast/css/hover-active-drag-expected.txt: Removed.
+        * fast/css/hover-active-drag.html: Removed.
+
 2011-12-08  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r101619.
+        http://trac.webkit.org/changeset/101619
+        https://bugs.webkit.org/show_bug.cgi?id=74158
+
+        this patch produces bad behaviour on mac (Requested by
+        jeremya_ on #webkit).
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::dragSourceEndedAt):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateHoverActiveState):
+
 2011-12-08  Adam Klein  <adamk@chromium.org>
 

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;
@@ -2755 +2762 @@
 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()) {
-                curr->node()->setActive(false);
+            if (curr->node() && !curr->isText())
                 curr->node()->clearInActiveChain();
-            }
         }
         doc->setActiveNode(0);
@@ -3998 +3996 @@
         }
     }
-    // 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 
@@ -4043 +4038 @@
     size_t removeCount = nodesToRemoveFromChain.size();
     for (size_t i = 0; i < removeCount; ++i) {
+        nodesToRemoveFromChain[i]->setActive(false);
         nodesToRemoveFromChain[i]->setHovered(false);
     }
@@ -4048 +4044 @@
     size_t addCount = nodesToAddToChain.size();
     for (size_t i = 0; i < addCount; ++i) {
-        if (allowActiveChanges)
-            nodesToAddToChain[i]->setActive(true);
+        nodesToAddToChain[i]->setActive(request.active());
         nodesToAddToChain[i]->setHovered(true);
     }