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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3ebe889f577a4589187be3d4e264cc7adcd31aba
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 02:26:07 2010 +0000

    WebKit2 should exit auto scrolling mode when losing focus
    https://bugs.webkit.org/show_bug.cgi?id=49209
    
    Reviewed by Jon Honeycutt.
    
    When a page loses focus, make sure that we stop the autoscroll timer, which exits pan scrolling mode. We
    don't want to automatically scroll when a page doesn't have focus.
    
    Updated manual-tests/autoscroll.html with instructions to test this bug.
    
    * manual-tests/autoscroll.html:
    * page/FocusController.cpp:
    (WebCore::FocusController::setFocused):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74170 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a0ec81..ab9df2e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-15  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        WebKit2 should exit auto scrolling mode when losing focus
+        https://bugs.webkit.org/show_bug.cgi?id=49209
+        
+        When a page loses focus, make sure that we stop the autoscroll timer, which exits pan scrolling mode. We
+        don't want to automatically scroll when a page doesn't have focus.
+
+        Updated manual-tests/autoscroll.html with instructions to test this bug.
+
+        * manual-tests/autoscroll.html:
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setFocused):
+
 2010-12-15  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/manual-tests/autoscroll.html b/WebCore/manual-tests/autoscroll.html
index 10f3bc5..db9bd90 100644
--- a/WebCore/manual-tests/autoscroll.html
+++ b/WebCore/manual-tests/autoscroll.html
@@ -20,6 +20,10 @@ When I mouse up after dragging a selection outside of a iframe, the iframe conti
 Autoscrolling should stop when you release the mouse button outside the frame (in the main frame, 
 in another subframe, or just outside the window).</p>
 
+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=49209">bug 49209</a>:
+Open another page in a different tab, middle click in the first iframe, scroll up, and select the other tab. The pan scrolling
+cursor should disappear, and you should exit pan scrolling mode.</p>
+
 <IFRAME FRAMEBORDER=1></IFRAME>
 <br>
 <IFRAME FRAMEBORDER=1></IFRAME>
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index a6dc676..9ca18dd 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -130,6 +130,9 @@ void FocusController::setFocused(bool focused)
     
     m_isFocused = focused;
 
+    if (!m_isFocused)
+        focusedOrMainFrame()->eventHandler()->stopAutoscrollTimer();
+
     if (!m_focusedFrame)
         setFocusedFrame(m_page->mainFrame());
 

-- 
WebKit Debian packaging