Changeset 46273 in webkit

Timestamp:

Jul 23, 2009 9:55:55 AM (15 years ago)

Author:

treat@webkit.org

Message:

WebCore:
2009-07-22 Viet-Trung Luu <​viettrungluu@gmail.com>

Reviewed by David Hyatt.

​https://bugs.webkit.org/show_bug.cgi?id=27289
When a mouse click occurs on a scrollbar without a preceding mouse move
onto it, the release isn't handled correctly (since
EventHandler::m_lastScrollbarUnderMouse isn't set on mouse down, but
only on mouse move). (Side comment: That scrollbar-handling code
in EventHandler is ugly. It should be fixed properly.)

Tests: scrollbars/scrollbar-miss-mousemove.html

scrollbars/scrollbar-miss-mousemove-disabled.html

• page/EventHandler.cpp: (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::updateLastScrollbarUnderMouse):
• page/EventHandler.h:

LayoutTests:
2009-07-22 Viet-Trung Luu <​viettrungluu@gmail.com>

Reviewed by David Hyatt.

​https://bugs.webkit.org/show_bug.cgi?id=27289
Tests that mouse clicks/releases are handled properly on scrollbars
even when there is no mouse move onto the scrollbar (two cases: enabled
and disabled controls).

• scrollbars/scrollbar-miss-mousemove-disabled-expected.txt: Added.
• scrollbars/scrollbar-miss-mousemove-disabled.html: Added.
• scrollbars/scrollbar-miss-mousemove-expected.txt: Added.
• scrollbars/scrollbar-miss-mousemove.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/scrollbars/scrollbar-miss-mousemove-disabled-expected.txt (added)
• LayoutTests/scrollbars/scrollbar-miss-mousemove-disabled.html (added)
• LayoutTests/scrollbars/scrollbar-miss-mousemove-expected.txt (added)
• LayoutTests/scrollbars/scrollbar-miss-mousemove.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (4 diffs)
• WebCore/page/EventHandler.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-07-22  Viet-Trung Luu  <viettrungluu@gmail.com>
+
+        Reviewed by David Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27289
+        Tests that mouse clicks/releases are handled properly on scrollbars
+        even when there is no mouse move onto the scrollbar (two cases: enabled
+        and disabled controls).
+
+        * scrollbars/scrollbar-miss-mousemove-disabled-expected.txt: Added.
+        * scrollbars/scrollbar-miss-mousemove-disabled.html: Added.
+        * scrollbars/scrollbar-miss-mousemove-expected.txt: Added.
+        * scrollbars/scrollbar-miss-mousemove.html: Added.
+
 2009-07-23  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-22  Viet-Trung Luu  <viettrungluu@gmail.com>
+
+        Reviewed by David Hyatt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27289
+        When a mouse click occurs on a scrollbar without a preceding mouse move
+        onto it, the release isn't handled correctly (since
+        EventHandler::m_lastScrollbarUnderMouse isn't set on mouse down, but
+        only on mouse move). (Side comment: That scrollbar-handling code
+        in EventHandler is ugly. It should be fixed properly.)
+
+        Tests: scrollbars/scrollbar-miss-mousemove.html
+               scrollbars/scrollbar-miss-mousemove-disabled.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::updateLastScrollbarUnderMouse):
+        * page/EventHandler.h:
+
 2009-07-23  Mike Fenton  <mike.fenton@torchmobile.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -1196 +1196 @@
     if (swallowEvent) {
         // scrollbars should get events anyway, even disabled controls might be scrollable
-        if (mev.scrollbar())
-            passMousePressEventToScrollbar(mev, mev.scrollbar());
+        Scrollbar* scrollbar = mev.scrollbar();
+
+        updateLastScrollbarUnderMouse(scrollbar, true);
+
+        if (scrollbar)
+            passMousePressEventToScrollbar(mev, scrollbar);
     } else {
         // Refetch the event target node if it currently is the shadow node inside an <input> element.
@@ -1212 +1216 @@
         if (!scrollbar)
             scrollbar = mev.scrollbar();
+
+        updateLastScrollbarUnderMouse(scrollbar, true);
+
         if (scrollbar && passMousePressEventToScrollbar(mev, scrollbar))
             swallowEvent = true;
@@ -1328 +1335 @@
             scrollbar = mev.scrollbar();
 
-        if (m_lastScrollbarUnderMouse != scrollbar) {
-            // Send mouse exited to the old scrollbar.
-            if (m_lastScrollbarUnderMouse)
-                m_lastScrollbarUnderMouse->mouseExited();
-            m_lastScrollbarUnderMouse = m_mousePressed ? 0 : scrollbar;
-        }
+        updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
     }
 
@@ -2423 +2425 @@
 }
 
-}
+// If scrollbar (under mouse) is different from last, send a mouse exited. Set
+// last to scrollbar if setLast is true; else set last to 0.
+void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setLast)
+{
+    if (m_lastScrollbarUnderMouse != scrollbar) {
+        // Send mouse exited to the old scrollbar.
+        if (m_lastScrollbarUnderMouse)
+            m_lastScrollbarUnderMouse->mouseExited();
+        m_lastScrollbarUnderMouse = setLast ? scrollbar : 0;
+    }
+}
+
+}

trunk/WebCore/page/EventHandler.h

@@ -272 +272 @@
     void updateSelectionForMouseDrag(Node* targetNode, const IntPoint& localPoint);
 
+    void updateLastScrollbarUnderMouse(Scrollbar*, bool);
+
     bool capturesDragging() const { return m_capturesDragging; }