Changeset 20761 in webkit

Timestamp:

Apr 6, 2007 2:37:48 PM (17 years ago)

Author:

hyatt

Message:

Fix for bug 13274. Rework mouse events so that subframe capturing works again. Make sure
everything just comes down through the top FrameView even when capturing is in effect. Update
scrollbar handling logic so that scrollbars receive events correctly while capturing is in
effect. Eliminate the notion of widget capture. Fix mouse moves so that they only fire
on the innermost hit frame.

Reviewed by olliej

• page/EventHandler.cpp: (WebCore::EventHandler::handleMouseDraggedEvent): (WebCore::subframeForTargetNode): (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::handleMouseReleaseEvent):
• page/EventHandler.h:
• platform/PopupMenu.h: (WebCore::PopupMenu::scrollbarCapturingMouse): (WebCore::PopupMenu::setScrollbarCapturingMouse):
• platform/ScrollBar.h: (WebCore::Scrollbar::handleMouseReleaseEvent):
• platform/Widget.h: (WebCore::Widget::geometryChanged):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (8 diffs)
• page/EventHandler.h (modified) (1 diff)
• platform/PopupMenu.h (modified) (2 diffs)
• platform/ScrollBar.h (modified) (1 diff)
• platform/Widget.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-06  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 13274.  Rework mouse events so that subframe capturing works again.  Make sure
+        everything just comes down through the top FrameView even when capturing is in effect.  Update
+        scrollbar handling logic so that scrollbars receive events correctly while capturing is in
+        effect.  Eliminate the notion of widget capture.  Fix mouse moves so that they only fire
+        on the innermost hit frame.
+
+        Reviewed by olliej
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDraggedEvent):
+        (WebCore::subframeForTargetNode):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        * page/EventHandler.h:
+        * platform/PopupMenu.h:
+        (WebCore::PopupMenu::scrollbarCapturingMouse):
+        (WebCore::PopupMenu::setScrollbarCapturingMouse):
+        * platform/ScrollBar.h:
+        (WebCore::Scrollbar::handleMouseReleaseEvent):
+        * platform/Widget.h:
+        (WebCore::Widget::geometryChanged):
+
 2007-04-06  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/page/EventHandler.cpp

@@ -306 +306 @@
 }
 
-bool EventHandler::handleMouseMoveEvent(const MouseEventWithHitTestResults& event)
+bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& event)
 {
     if (handleDrag(event))
@@ -593 +593 @@
 }
 
-static Frame* subframeForTargetNode(Node* node)
+Frame* subframeForTargetNode(Node* node)
 {
     if (!node)
@@ -788 +788 @@
     Frame* subframe = subframeForTargetNode(mev.targetNode());
     if (subframe && passMousePressEventToSubframe(mev, subframe)) {
+        // Start capturing future events for this frame.  We only do this if we didn't clear
+        // the m_mousePressed flag, which may happen if an AppKit widget entered a modal event loop.
+        if (m_mousePressed)
+            m_capturingMouseEventsNode = mev.targetNode();
         invalidateClick();
         return true;
@@ -884 +888 @@
         return dispatchMouseEvent(mousemoveEvent, m_frameSetBeingResized.get(), false, 0, mouseEvent, false);
 
+    // Send events right to a scrollbar if the mouse is pressed.
+    if (m_lastScrollbarUnderMouse && m_mousePressed)
+        return m_lastScrollbarUnderMouse->handleMouseMoveEvent(mouseEvent);
+
     // Treat mouse move events while the mouse is pressed as "read-only" in prepareMouseEvent
     // if we are allowed to select.
@@ -891 +899 @@
     MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseEvent);
 
-    if (m_lastMouseMoveEventSubframe && m_lastMouseMoveEventSubframe->tree()->isDescendantOf(m_frame))
-        passMouseMoveEventToSubframe(mev, m_lastMouseMoveEventSubframe.get());
-
-    bool swallowEvent = dispatchMouseEvent(mousemoveEvent, mev.targetNode(), false, 0, mouseEvent, true);
-
     PlatformScrollbar* scrollbar = 0;
     if (m_frame->view())
@@ -913 +916 @@
         m_resizeLayer->resize(mouseEvent, m_offsetFromResizeCorner);
 
-    if (!swallowEvent)
-        swallowEvent = handleMouseMoveEvent(mev);
-    
-    RefPtr<Frame> newSubframe = subframeForTargetNode(mev.targetNode());
-    if (newSubframe) {
-        if (m_lastMouseMoveEventSubframe != newSubframe)
-            swallowEvent |= passMouseMoveEventToSubframe(mev, newSubframe.get());
-    } else {
+    bool swallowEvent = false;
+    Node* targetNode = m_capturingMouseEventsNode.get() ? m_capturingMouseEventsNode.get() : mev.targetNode();
+    RefPtr<Frame> newSubframe = subframeForTargetNode(targetNode);
+    if (m_lastMouseMoveEventSubframe && m_lastMouseMoveEventSubframe->tree()->isDescendantOf(m_frame) && m_lastMouseMoveEventSubframe != newSubframe)
+        passMouseMoveEventToSubframe(mev, m_lastMouseMoveEventSubframe.get());
+    if (newSubframe)
+        swallowEvent |= passMouseMoveEventToSubframe(mev, newSubframe.get());
+    else {
         if (scrollbar && !m_mousePressed)
             scrollbar->handleMouseMoveEvent(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
@@ -926 +929 @@
             m_frame->view()->setCursor(selectCursor(mev, m_frame, m_mousePressed, scrollbar, m_capturingMouseEventsNode));
     }
-
+    
     m_lastMouseMoveEventSubframe = newSubframe;
+
+    if (swallowEvent)
+        return true;
+        
+    swallowEvent = dispatchMouseEvent(mousemoveEvent, mev.targetNode(), false, 0, mouseEvent, true);
+    if (!swallowEvent)
+        swallowEvent = handleMouseDraggedEvent(mev);
 
     return swallowEvent;
@@ -951 +961 @@
         return dispatchMouseEvent(mouseupEvent, m_frameSetBeingResized.get(), true, m_clickCount, mouseEvent, false);
 
+    if (m_lastScrollbarUnderMouse) {
+        invalidateClick();
+        return m_lastScrollbarUnderMouse->handleMouseReleaseEvent(mouseEvent);
+    }
+
     MouseEventWithHitTestResults mev = prepareMouseEvent(HitTestRequest(false, false, false, true), mouseEvent);
-    Frame* subframe = subframeForTargetNode(mev.targetNode());
+    Node* targetNode = m_capturingMouseEventsNode.get() ? m_capturingMouseEventsNode.get() : mev.targetNode();
+    setCapturingMouseEventsNode(0);
+    Frame* subframe = subframeForTargetNode(targetNode);
     if (subframe && passMouseReleaseEventToSubframe(mev, subframe))
         return true;

trunk/WebCore/page/EventHandler.h

@@ -185 +185 @@
     bool handleMousePressEventDoubleClick(const MouseEventWithHitTestResults&);
     bool handleMousePressEventTripleClick(const MouseEventWithHitTestResults&);
-    bool handleMouseMoveEvent(const MouseEventWithHitTestResults&);
+    bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&);
     bool handleMouseReleaseEvent(const MouseEventWithHitTestResults&);
 

trunk/WebCore/platform/PopupMenu.h

@@ -104 +104 @@
     void reduceWheelDelta(int delta);
     int wheelDelta() const { return m_wheelDelta; }
+
+    bool scrollbarCapturingMouse() const { return m_scrollbarCapturingMouse; }
+    void setScrollbarCapturingMouse(bool b) { m_scrollbarCapturingMouse = b; }
 #endif
 
@@ -141 +144 @@
     int m_wheelDelta;
     int m_focusedIndex;
+    bool m_scrollbarCapturingMouse;
 #endif
 

trunk/WebCore/platform/ScrollBar.h

@@ -93 +93 @@
     virtual bool handleMouseOutEvent(const PlatformMouseEvent&) { return false; }
 
+    // Used by some platform scrollbars to know when they've been released from capture.
+    virtual bool handleMouseReleaseEvent(const PlatformMouseEvent&) { return false; }
+   
 protected:
     virtual void updateThumbPosition() = 0;

trunk/WebCore/platform/Widget.h

@@ -121 +121 @@
 
         virtual void geometryChanged() const {};
-
-        bool capturingMouse() const;
-        void setCapturingMouse(bool);
-        Widget* capturingTarget();
-        Widget* capturingChild();
-        void setCapturingChild(Widget*);
         
         IntRect convertToContainingWindow(const IntRect&) const;