Changeset 20766 in webkit

Timestamp:

Apr 6, 2007, 5:15:41 PM (18 years ago)

Author:

hyatt

Message:

Fix failing slider layout test. Don't clear the subframe capture unless we really were capturing on a
subframe.

Reviewed by adele, darin

• page/EventHandler.cpp: (WebCore::EventHandler::handleMouseReleaseEvent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-06  David Hyatt  <hyatt@apple.com>
+
+        Fix failing slider layout test.  Don't clear the subframe capture unless we really were capturing on a
+        subframe.
+
+        Reviewed by adele, darin
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+
 2007-04-06  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -968 +968 @@
     MouseEventWithHitTestResults mev = prepareMouseEvent(HitTestRequest(false, false, false, true), mouseEvent);
     Node* targetNode = m_capturingMouseEventsNode.get() ? m_capturingMouseEventsNode.get() : mev.targetNode();
-    setCapturingMouseEventsNode(0);
     Frame* subframe = subframeForTargetNode(targetNode);
-    if (subframe && passMouseReleaseEventToSubframe(mev, subframe))
+    if (subframe && passMouseReleaseEventToSubframe(mev, subframe)) {
+        setCapturingMouseEventsNode(0);
         return true;
+    }
 
     bool swallowMouseUpEvent = dispatchMouseEvent(mouseupEvent, mev.targetNode(), true, m_clickCount, mouseEvent, false);