[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 340adf3602d75b3a2da2ff1b7b186dab6214db98
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 20:49:30 2011 +0000

    Always show the arrow cursor when the web process has crashed
    
    Fixes <http://webkit.org/b/52006> WKView shows a stale cursor when the
    web process crashes
    
    Reviewed by Ada Chan.
    
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::processDidCrash):
    (WebKit::WebView::didRelaunchProcess):
    Update the cursor to reflect the new state.
    
    (WebKit::WebView::cursorToShow): Always show the arrow cursor when the
    web process has crashed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3534d75..aba09a3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,22 @@
 2011-01-06  Adam Roben  <aroben at apple.com>
 
+        Always show the arrow cursor when the web process has crashed
+
+        Fixes <http://webkit.org/b/52006> WKView shows a stale cursor when the
+        web process crashes
+
+        Reviewed by Ada Chan.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::processDidCrash):
+        (WebKit::WebView::didRelaunchProcess):
+        Update the cursor to reflect the new state.
+
+        (WebKit::WebView::cursorToShow): Always show the arrow cursor when the
+        web process has crashed.
+
+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
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index d4d77be..d95526b 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -582,6 +582,7 @@ void WebView::close()
 
 void WebView::processDidCrash()
 {
+    updateNativeCursor();
     ::InvalidateRect(m_window, 0, TRUE);
 }
 
@@ -594,6 +595,7 @@ void WebView::didRelaunchProcess()
     m_page->reinitializeWebPage(IntRect(clientRect).size());
     updateActiveState();
     m_page->setFocused(::GetFocus() == m_window);
+    updateNativeCursor();
 
     ::InvalidateRect(m_window, 0, TRUE);
 }
@@ -624,8 +626,12 @@ void WebView::toolTipChanged(const String&, const String& newToolTip)
 
 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_page->isValid())
+        return arrowCursor;
+
+    // We only show the override cursor if the default (arrow) cursor is showing.
     if (m_overrideCursor && m_webCoreCursor == arrowCursor)
         return m_overrideCursor;
 

-- 
WebKit Debian packaging