Mac, Qt, and Gdk build fixes.

* page/EventHandler.h:
* page/gdk/EventHandlerGdk.cpp:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::passSubframeEventToSubframe):
* page/qt/EventHandlerQt.cpp:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d6ab23199d1bcdc2e67fb42139f29d6fb13c84b1..12dd00f27b762ee0584ad6a31aed23b1130ec000 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-04  Adam Roben  <aroben@apple.com>
+
+        Mac, Qt, and Gdk build fixes.
+
+        * page/EventHandler.h:
+        * page/gdk/EventHandlerGdk.cpp:
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::passSubframeEventToSubframe):
+        * page/qt/EventHandlerQt.cpp:
+
 2007-07-04  Adam Roben  <aroben@apple.com>
 
         Fix the Qt/Gdk builds.

diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index df61bbf8508512a996c24dd2e0d051c1c0c98b2e..9528428b52aa5f5ddb0455de8f0fb017ac90d9c6 100644 (file)
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -228,7 +228,7 @@ private:
     bool passMouseMoveEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe, HitTestResult* hoveredNode = 0);
     bool passMouseReleaseEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe);
 
-    bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe);
+    bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe, HitTestResult* hoveredNode = 0);
 
     bool passMousePressEventToScrollbar(MouseEventWithHitTestResults&, PlatformScrollbar*);
 

diff --git a/WebCore/page/gdk/EventHandlerGdk.cpp b/WebCore/page/gdk/EventHandlerGdk.cpp
index 7ca70ab7e20c6dfc8529ef523928cc409aaf1d55..43b6b80687a66900e1d6ce386e39ae5af40d62e4 100644 (file)
--- a/WebCore/page/gdk/EventHandlerGdk.cpp
+++ b/WebCore/page/gdk/EventHandlerGdk.cpp
@@ -91,7 +91,7 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
     return false;
 }
 
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe)
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe, HitTestResult*)
 {
     notImplemented();
     return false;

diff --git a/WebCore/page/mac/EventHandlerMac.mm b/WebCore/page/mac/EventHandlerMac.mm
index 762abd72a2f9d7a6d7007cdee3d9035e541b16e9..4311de80bd51fef78c5befdd5008b89fe18acfa1 100644 (file)
--- a/WebCore/page/mac/EventHandlerMac.mm
+++ b/WebCore/page/mac/EventHandlerMac.mm
@@ -369,13 +369,16 @@ bool EventHandler::eventLoopHandleMouseUp(const MouseEventWithHitTestResults&)
     return true;
 }
     
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe)
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe, HitTestResult* hoveredNode)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
     switch ([currentEvent().get() type]) {
         case NSMouseMoved:
-            subframe->eventHandler()->mouseMoved(currentEvent().get());
+            // Since we're passing in currentEvent() here, we can call
+            // handleMouseMoveEvent() directly, since the save/restore of
+            // currentEvent() that mouseMoved() does would have no effect.
+            subframe->eventHandler()->handleMouseMoveEvent(currentEvent().get(), hoveredNode);
             return true;
         
         case NSLeftMouseDown: {

diff --git a/WebCore/page/qt/EventHandlerQt.cpp b/WebCore/page/qt/EventHandlerQt.cpp
index c40f88ae61fbfdd922e84ff26fa7962380b0144d..b59d9a259ac698991545208ae1b4c4df58a6ffcf 100644 (file)
--- a/WebCore/page/qt/EventHandlerQt.cpp
+++ b/WebCore/page/qt/EventHandlerQt.cpp
@@ -108,7 +108,7 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
     return false;
 }
 
-bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe)
+bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults& event, Frame* subframe, HitTestResult*)
 {
     notImplemented();
     return false;