[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 42019d39a172dad945d4c1f9dd25028be0c2e6cf
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 00:57:37 2010 +0000

    Cursor does not always change back to arrow when exiting image document
    https://bugs.webkit.org/show_bug.cgi?id=50190
    <rdar://problem/8665265>
    
    Reviewed by Sam Weinig.
    
    * Shared/mac/WebEventFactory.mm:
    (WebKit::mouseEventTypeForEvent):
    (WebKit::globalPointForEvent):
    (WebKit::pointForEvent):
    Handle the NSMouseEntered and NSMouseExited events.
    
    * UIProcess/API/mac/WKView.mm:
    (-[WKView initWithFrame:pageNamespaceRef:hiddenFromInjectedBundle:]):
    We want entered and exited events for this tracking area.
    Add mouseEntered and mouseExited handlers.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fcddb03..6d119fd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,24 @@
 2010-11-29  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        Cursor does not always change back to arrow when exiting image document
+        https://bugs.webkit.org/show_bug.cgi?id=50190
+        <rdar://problem/8665265>
+
+        * Shared/mac/WebEventFactory.mm:
+        (WebKit::mouseEventTypeForEvent):
+        (WebKit::globalPointForEvent):
+        (WebKit::pointForEvent):
+        Handle the NSMouseEntered and NSMouseExited events.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:pageNamespaceRef:hiddenFromInjectedBundle:]):
+        We want entered and exited events for this tracking area.
+        Add mouseEntered and mouseExited handlers.
+
+2010-11-29  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Darin Adler.
 
         Should be able to pause and resume downloads
diff --git a/WebKit2/Shared/mac/WebEventFactory.mm b/WebKit2/Shared/mac/WebEventFactory.mm
index a6b321e..9068995 100644
--- a/WebKit2/Shared/mac/WebEventFactory.mm
+++ b/WebKit2/Shared/mac/WebEventFactory.mm
@@ -57,9 +57,11 @@ static WebEvent::Type mouseEventTypeForEvent(NSEvent* event)
 {
     switch ([event type]) {
         case NSLeftMouseDragged:
-        case NSRightMouseDragged:
-        case NSOtherMouseDragged:
+        case NSMouseEntered:
+        case NSMouseExited:
         case NSMouseMoved:
+        case NSOtherMouseDragged:
+        case NSRightMouseDragged:
             return WebEvent::MouseMove;
         case NSLeftMouseDown:
         case NSRightMouseDown:
@@ -121,15 +123,17 @@ static NSPoint globalPointForEvent(NSEvent *event)
 {
     switch ([event type]) {
         case NSLeftMouseDown:
-        case NSLeftMouseUp:
         case NSLeftMouseDragged:
-        case NSRightMouseDown:
-        case NSRightMouseUp:
-        case NSRightMouseDragged:
+        case NSLeftMouseUp:
+        case NSMouseEntered:
+        case NSMouseExited:
+        case NSMouseMoved:
         case NSOtherMouseDown:
-        case NSOtherMouseUp:
         case NSOtherMouseDragged:
-        case NSMouseMoved:
+        case NSOtherMouseUp:
+        case NSRightMouseDown:
+        case NSRightMouseDragged:
+        case NSRightMouseUp:
         case NSScrollWheel:
             return globalPoint([event locationInWindow], [event window]);
         default:
@@ -141,15 +145,17 @@ static NSPoint pointForEvent(NSEvent *event, NSView *windowView)
 {
     switch ([event type]) {
         case NSLeftMouseDown:
-        case NSLeftMouseUp:
         case NSLeftMouseDragged:
-        case NSRightMouseDown:
-        case NSRightMouseUp:
-        case NSRightMouseDragged:
+        case NSLeftMouseUp:
+        case NSMouseEntered:
+        case NSMouseExited:
+        case NSMouseMoved:
         case NSOtherMouseDown:
-        case NSOtherMouseUp:
         case NSOtherMouseDragged:
-        case NSMouseMoved:
+        case NSOtherMouseUp:
+        case NSRightMouseDown:
+        case NSRightMouseDragged:
+        case NSRightMouseUp:
         case NSScrollWheel: {
             // Note: This will have its origin at the bottom left of the window unless windowView is flipped.
             // In those cases, the Y coordinate gets flipped by Widget::convertFromContainingWindow.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 884b516..d706884 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -124,7 +124,7 @@ struct EditCommandState {
     RunLoop::initializeMainRunLoop();
 
     NSTrackingArea *trackingArea = [[NSTrackingArea alloc] initWithRect:frame
-                                                                options:(NSTrackingMouseMoved | NSTrackingActiveInKeyWindow | NSTrackingInVisibleRect)
+                                                                options:(NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow | NSTrackingInVisibleRect)
                                                                   owner:self
                                                                userInfo:nil];
     [self addTrackingArea:trackingArea];
@@ -306,17 +306,19 @@ WEBCORE_COMMAND(selectAll)
     }
 
 EVENT_HANDLER(mouseDown, Mouse)
-EVENT_HANDLER(mouseUp, Mouse)
-EVENT_HANDLER(mouseMoved, Mouse)
 EVENT_HANDLER(mouseDragged, Mouse)
-EVENT_HANDLER(rightMouseDown, Mouse)
-EVENT_HANDLER(rightMouseUp, Mouse)
-EVENT_HANDLER(rightMouseMoved, Mouse)
-EVENT_HANDLER(rightMouseDragged, Mouse)
+EVENT_HANDLER(mouseEntered, Mouse)
+EVENT_HANDLER(mouseExited, Mouse)
+EVENT_HANDLER(mouseMoved, Mouse)
+EVENT_HANDLER(mouseUp, Mouse)
 EVENT_HANDLER(otherMouseDown, Mouse)
-EVENT_HANDLER(otherMouseUp, Mouse)
-EVENT_HANDLER(otherMouseMoved, Mouse)
 EVENT_HANDLER(otherMouseDragged, Mouse)
+EVENT_HANDLER(otherMouseMoved, Mouse)
+EVENT_HANDLER(otherMouseUp, Mouse)
+EVENT_HANDLER(rightMouseDown, Mouse)
+EVENT_HANDLER(rightMouseDragged, Mouse)
+EVENT_HANDLER(rightMouseMoved, Mouse)
+EVENT_HANDLER(rightMouseUp, Mouse)
 EVENT_HANDLER(scrollWheel, Wheel)
 
 #undef EVENT_HANDLER

-- 
WebKit Debian packaging