Hook up mouse events with the correct coordinates. Make sure they are view-local and flipped.

Review URL: http://codereview.chromium.org/8150

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3924 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/webkit/glue/webinputevent_mac.mm b/webkit/glue/webinputevent_mac.mm
index 0355bcc..8fc524d 100644
--- a/webkit/glue/webinputevent_mac.mm
+++ b/webkit/glue/webinputevent_mac.mm
@@ -17,7 +17,7 @@ static const unsigned long kDefaultScrollLinesPerWheelDelta = 3;
 
 // WebMouseEvent --------------------------------------------------------------
 
-WebMouseEvent::WebMouseEvent(NSEvent *event) {
+WebMouseEvent::WebMouseEvent(NSEvent *event, NSView* view) {
   switch ([event type]) {
     case NSMouseExited:
       type = MOUSE_LEAVE;
@@ -72,9 +72,10 @@ WebMouseEvent::WebMouseEvent(NSEvent *event) {
   global_x = location.x;
   global_y = location.y;
 
-  location = [event locationInWindow];  // local (to receiving window)
+  NSPoint windowLocal = [event locationInWindow];
+  location = [view convertPoint:windowLocal fromView:nil];
+  y = [view frame].size.height - location.y;  // flip y
   x = location.x;
-  y = location.y;
   
   // set modifiers:
 
@@ -95,7 +96,7 @@ WebMouseEvent::WebMouseEvent(NSEvent *event) {
 
 // WebMouseWheelEvent ---------------------------------------------------------
 
-WebMouseWheelEvent::WebMouseWheelEvent(NSEvent *event) {
+WebMouseWheelEvent::WebMouseWheelEvent(NSEvent *event, NSView* view) {
   type = MOUSE_WHEEL;
   button = BUTTON_NONE;
 
@@ -103,9 +104,10 @@ WebMouseWheelEvent::WebMouseWheelEvent(NSEvent *event) {
   global_x = location.x;
   global_y = location.y;
   
-  location = [event locationInWindow];  // local (to receiving window)
+  NSPoint windowLocal = [event locationInWindow];
+  location = [view convertPoint:windowLocal fromView:nil];
+  y = [view frame].size.height - location.y;  // flip y
   x = location.x;
-  y = location.y;
 
   int wheel_delta = [event deltaY];
   const int delta_lines = wheel_delta * kDefaultScrollLinesPerWheelDelta;