[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 a78d2f2fb66283dbca93641fd2263b779d5598d6
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 24 17:54:10 2011 +0000

    WebKit2 version of <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.
    
    * UIProcess/API/mac/PageClientImpl.mm:
    (WebKit::PageClientImpl::setCursor): If the current cursor comes from a cursor rect, do not override it.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 60ab104..f1d02db 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by John Sullivan.
+
+        WebKit2 version of <rdar://problem/6097826> Mail's cursor does not become a resize cursor when moving mouse from scrolled email to the horizontal splitter
+
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::setCursor): If the current cursor comes from a cursor rect, do not override it.
+
 2011-01-24  Balazs Kelemen  <kbalazs at webkit.org>
 
         Rubber-stamped by Csaba Osztrogonác.
diff --git a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
index 60be5bc..6eab7f6 100644
--- a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
+++ b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm
@@ -43,6 +43,10 @@
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>
 
+ at interface NSApplication (WebNSApplicationDetails)
+- (NSCursor *)_cursorRectCursor;
+ at end
+
 using namespace WebCore;
 
 @interface WebEditCommandObjC : NSObject
@@ -195,7 +199,8 @@ void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newT
 
 void PageClientImpl::setCursor(const WebCore::Cursor& cursor)
 {
-    [m_wkView _setCursor:cursor.platformCursor()];
+    if (![NSApp _cursorRectCursor])
+        [m_wkView _setCursor:cursor.platformCursor()];
 }
 
 void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&)

-- 
WebKit Debian packaging