Fix failing slider layout test. Don't clear the subframe capture unless...
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Apr 2007 00:15:41 +0000 (00:15 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Apr 2007 00:15:41 +0000 (00:15 +0000)
        subframe.

        Reviewed by adele, darin

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@20766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/page/EventHandler.cpp

index 87becc2..0337b68 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         Reviewed by Geoff and Darin.
index fbb442a..8c72caa 100644 (file)
@@ -967,10 +967,11 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
 
     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);