[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

bweinstein at apple.com bweinstein at apple.com
Thu Oct 29 20:51:04 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit d99885aa52db0092ce3ff3866d3a9f07d2868515
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 23:35:35 2009 +0000

    Pan-scrolling pointer shows up in other tabs or windows, can't "fix" it.
    <http://webkit.org/b/30732> and <rdar://7332018>.
    
    Reviewed by John Sullivan.
    
    Turns off pan-scrolling on a WebView when it is about to lose focus.
    
    * WebView.cpp:
    (WebViewWndProc):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 657b70d..8afe04d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-23  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Pan-scrolling pointer shows up in other tabs or windows, can't "fix" it.
+        <http://webkit.org/b/30732> and <rdar://7332018>.
+        
+        Turns off pan-scrolling on a WebView when it is about to lose focus.
+
+        * WebView.cpp:
+        (WebViewWndProc):
+
 2009-10-23  Jon Honeycutt  <jhoneycutt at apple.com>
 
         MSAA: Name for image elements should use alt attribute text
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 7602f61..e2f3fae 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -1985,6 +1985,10 @@ static LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, L
             // Send blur events unless we're losing focus to a child of ours.
             if (!IsChild(hWnd, newFocusWnd))
                 focusController->setFocused(false);
+
+            // If we are pan-scrolling when we lose focus, stop the pan scrolling.
+            frame->eventHandler()->stopAutoscrollTimer();
+
             break;
         }
         case WM_WINDOWPOSCHANGED:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list