[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0b07d2ec40c59bd4812442d1891a2acc1083a2ad
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 20:49:02 2011 +0000

    Reduce code duplication in WebView::updateNativeCursor
    
    Fixes <http://webkit.org/b/52005> It's not easy to add new behavior to
    WebView::updateNativeCursor
    
    Reviewed by Ada Chan.
    
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::cursorToShow): Moved code to choose a cursor here...
    (WebKit::WebView::updateNativeCursor): ...from here.
    
    * UIProcess/win/WebView.h: Added cursorToShow.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index dc523ac..3534d75 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
 2011-01-06  Adam Roben  <aroben at apple.com>
 
+        Reduce code duplication in WebView::updateNativeCursor
+
+        Fixes <http://webkit.org/b/52005> It's not easy to add new behavior to
+        WebView::updateNativeCursor
+
+        Reviewed by Ada Chan.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::cursorToShow): Moved code to choose a cursor here...
+        (WebKit::WebView::updateNativeCursor): ...from here.
+
+        * UIProcess/win/WebView.h: Added cursorToShow.
+
+2011-01-06  Adam Roben  <aroben at apple.com>
+
         Make WKView fill with white when the web process has crashed
 
         Previously we would just draw whatever we had last drawn into the
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 4c2dc9f..d4d77be 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -622,15 +622,19 @@ void WebView::toolTipChanged(const String&, const String& newToolTip)
     ::SendMessage(m_toolTipWindow, TTM_ACTIVATE, !newToolTip.isEmpty(), 0);
 }
 
-void WebView::updateNativeCursor()
+HCURSOR WebView::cursorToShow() const
 {
     // We only show the override cursor if the default (arrow) cursor is showing.
     static HCURSOR arrowCursor = ::LoadCursor(0, IDC_ARROW);
     if (m_overrideCursor && m_webCoreCursor == arrowCursor)
-        m_lastCursorSet = m_overrideCursor;
-    else
-        m_lastCursorSet = m_webCoreCursor;
+        return m_overrideCursor;
+
+    return m_webCoreCursor;
+}
 
+void WebView::updateNativeCursor()
+{
+    m_lastCursorSet = cursorToShow();
     ::SetCursor(m_lastCursorSet);
 }
 
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 814fed4..3216154 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -101,6 +101,7 @@ private:
 
     void close();
 
+    HCURSOR cursorToShow() const;
     void updateNativeCursor();
 
     // PageClient

-- 
WebKit Debian packaging