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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ee4fefebe5325a95cfc5fefb0cf92f4b3a10553f
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 19:49:43 2010 +0000

    Control + Mousewheel shouldn't be handled in WebKit2
    https://bugs.webkit.org/show_bug.cgi?id=48253
    
    Reviewed by Adam Roben.
    
    Don't handle a wheel event if Control is pressed, pass the message back to DefWindowProc.
    
    * UIProcess/win/WebView.cpp:
    (WebKit::WebView::onWheelEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70479 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c4498e3..2dae2d4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Control + Mousewheel shouldn't be handled in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=48253
+        
+        Don't handle a wheel event if Control is pressed, pass the message back to DefWindowProc.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::onWheelEvent):
+
 2010-10-25  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index c6fd9de..47145a3 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -314,23 +314,14 @@ LRESULT WebView::onMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 
 LRESULT WebView::onWheelEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, bool& handled)
 {
-    // Ctrl+Mouse wheel doesn't ever go into WebCore.  It is used to
-    // zoom instead (Mac zooms the whole Desktop, but Windows browsers trigger their
-    // own local zoom modes for Ctrl+wheel).
-    /*
-    if (wParam & MK_CONTROL) {
-        short delta = static_cast<short>(HIWORD(wParam));
-        if (delta < 0)
-            m_page->makeTextSmaller(0);
-        else
-            m_page->makeTextLarger(0);
-
-        handled = true;
+    WebWheelEvent wheelEvent = WebEventFactory::createWebWheelEvent(hWnd, message, wParam, lParam);
+    if (wheelEvent.controlKey()) {
+        // We do not want WebKit to handle Control + Wheel, this should be handled by the client application
+        // to zoom the page.
+        handled = false;
         return 0;
     }
-    */
 
-    WebWheelEvent wheelEvent = WebEventFactory::createWebWheelEvent(hWnd, message, wParam, lParam);
     m_page->handleWheelEvent(wheelEvent);
 
     handled = true;

-- 
WebKit Debian packaging