Changeset 19166 for trunk/WebCore/page/mac/EventHandlerMac.mm

Timestamp:

01/26/07 16:03:56 (2 years ago)

Author:

bdakin

Message:

Reviewed by Darin.

Fix for <rdar://problem/4956565> REGRESSION: After scrolling frame,
hovering over link in this frame doesn't change cursor to pointing
hand

The mouseMove event was not being propagated correctly after using
the mouse to scroll the frame because m_mousePressed was never
getting set to false.

• page/EventHandler.cpp: (WebCore::EventHandler::handleMousePressEvent): This code does not belong here.
• page/EventHandler.h: lastEventIsMouseUp() is only ever relevant in EventHandlerMac, so it can just be a static function there.
• page/mac/EventHandlerMac.mm: (WebCore::lastEventIsMouseUp): Make this static. (WebCore::EventHandler::passMouseDownEventToWidget): Here is where we need to set m_mousePressed to false if lastEventIsMouseUp() is true.

Files:

• trunk/WebCore/page/mac/EventHandlerMac.mm (modified) (2 diffs)

trunk/WebCore/page/mac/EventHandlerMac.mm

@@ -203 +203 @@
 }
 
+static bool lastEventIsMouseUp()
+{
+    // Many AK widgets run their own event loops and consume events while the mouse is down.
+    // When they finish, currentEvent is the mouseUp that they exited on.  We need to update
+    // the khtml state with this mouseUp, which khtml never saw.  This method lets us detect
+    // that state.
+
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    NSEvent *currentEventAfterHandlingMouseDown = [NSApp currentEvent];
+    if (currentEvent != currentEventAfterHandlingMouseDown &&
+        [currentEventAfterHandlingMouseDown type] == NSLeftMouseUp &&
+        [currentEventAfterHandlingMouseDown timestamp] >= [currentEvent timestamp])
+            return true;
+    END_BLOCK_OBJC_EXCEPTIONS;
+
+    return false;
+}
+
 bool EventHandler::passMouseDownEventToWidget(Widget* widget)
 {
@@ -273 +291 @@
     m_mouseDownView = view;
     m_mouseDownWasInSubframe = false;
+    
+    // Many AppKit widgets run their own event loops and consume events while the mouse is down.
+    // When they finish, currentEvent is the mouseUp that they exited on.  We need to update
+    // the EventHandler state with this mouseUp, which we never saw.
+    // If this event isn't a mouseUp, we assume that the mouseUp will be coming later.  There
+    // is a hole here if the widget consumes both the mouseUp and subsequent events.
+    if (lastEventIsMouseUp())
+        m_mousePressed = false;
 
     END_BLOCK_OBJC_EXCEPTIONS;
 
     return true;
-}
-
-bool EventHandler::lastEventIsMouseUp() const
-{
-    // Many AK widgets run their own event loops and consume events while the mouse is down.
-    // When they finish, currentEvent is the mouseUp that they exited on.  We need to update
-    // the khtml state with this mouseUp, which khtml never saw.  This method lets us detect
-    // that state.
-
-    BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    NSEvent *currentEventAfterHandlingMouseDown = [NSApp currentEvent];
-    if (currentEvent != currentEventAfterHandlingMouseDown &&
-        [currentEventAfterHandlingMouseDown type] == NSLeftMouseUp &&
-        [currentEventAfterHandlingMouseDown timestamp] >= [currentEvent timestamp])
-            return true;
-    END_BLOCK_OBJC_EXCEPTIONS;
-
-    return false;
 }