Changeset 106476 in webkit

Timestamp:

Feb 1, 2012 10:45:17 AM (12 years ago)

Author:

Nate Chapin

Message:

Source/WebCore: preventDefault() in a mousedown in a subframe should not
prevent the scrollbar from handling mouse movements if the
cursor leaves the subframe.
​https://bugs.webkit.org/show_bug.cgi?id=73097

Reviewed by Darin Adler.

Test: fast/events/scroll-div-with-prevent-default-in-subframe.html

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMousePressEvent):

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=73097.
Test adapted from repro case provided by ​zacklloyd@google.com.

Reviewed by Darin Adler.

• fast/events/resources/subframe-with-scrollable-div.html: Added.
• fast/events/scroll-div-with-prevent-default-in-subframe-expected.txt: Added.
• fast/events/scroll-div-with-prevent-default-in-subframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/resources/subframe-with-scrollable-div.html (added)
• LayoutTests/fast/events/scroll-div-with-prevent-default-in-subframe-expected.txt (added)
• LayoutTests/fast/events/scroll-div-with-prevent-default-in-subframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-01  Nate Chapin  <japhet@chromium.org>
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=73097.
+        Test adapted from repro case provided by zacklloyd@google.com.
+
+        Reviewed by Darin Adler.
+
+        * fast/events/resources/subframe-with-scrollable-div.html: Added.
+        * fast/events/scroll-div-with-prevent-default-in-subframe-expected.txt: Added.
+        * fast/events/scroll-div-with-prevent-default-in-subframe.html: Added.
+
 2012-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-01  Nate Chapin  <japhet@chromium.org>
+
+        preventDefault() in a mousedown in a subframe should not
+        prevent the scrollbar from handling mouse movements if the
+        cursor leaves the subframe.
+        https://bugs.webkit.org/show_bug.cgi?id=73097
+
+        Reviewed by Darin Adler.
+
+        Test: fast/events/scroll-div-with-prevent-default-in-subframe.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMousePressEvent):
+
 2012-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1462 +1462 @@
 
     bool swallowEvent = dispatchMouseEvent(eventNames().mousedownEvent, targetNode(mev), true, m_clickCount, mouseEvent, true);
-    m_capturesDragging = !swallowEvent;
+    m_capturesDragging = !swallowEvent || mev.scrollbar();
 
     // If the hit testing originally determined the event was in a scrollbar, refetch the MouseEventWithHitTestResults