[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 5e32c9c59cce207e0ab02bd905ac5ab09114c5c7
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 23 17:33:32 2011 +0000

    <rdar://problem/6097826> Mail's cursor does not become a resize cursor when moving mouse from scrolled email to the horizontal splitter
    
    Reviewed by John Sullivan.
    
    * WebCoreSupport/WebChromeClient.mm:
    (WebChromeClient::setCursor): If the current cursor comes from a cursor rect, do not override it.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index efad438..02df835 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-23  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/6097826> Mail's cursor does not become a resize cursor when moving mouse from scrolled email to the horizontal splitter
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::setCursor): If the current cursor comes from a cursor rect, do not override it.
+
 2011-01-22  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
index 74c513d..a5fd71a 100644
--- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -80,6 +80,10 @@
 #import "NetscapePluginHostManager.h"
 #endif
 
+ at interface NSApplication (WebNSApplicationDetails)
+- (NSCursor *)_cursorRectCursor;
+ at end
+
 @interface NSView (WebNSViewDetails)
 - (NSView *)_findLastViewInKeyViewLoop;
 @end
@@ -678,6 +682,9 @@ void WebChromeClient::chooseIconForFiles(const Vector<String>& filenames, FileCh
 
 void WebChromeClient::setCursor(const WebCore::Cursor& cursor)
 {
+    if ([NSApp _cursorRectCursor])
+        return;
+
     NSCursor *platformCursor = cursor.platformCursor();
     if ([NSCursor currentCursor] == platformCursor)
         return;

-- 
WebKit Debian packaging