[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit bce9a8093d6f4a79711cbfd665183024b57b93fd
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 21:30:57 2010 +0000

    Rubberstamped by Noam Rosenthal, who wrote the original code.
    
    Make mouse wheel scrolling work when using the GraphicsLayer.
    
    * platform/graphics/qt/GraphicsLayerQt.cpp:
    (WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1369388..ef43d75 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-19  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Rubberstamped by Noam Rosenthal, who wrote the original code.
+
+        Make mouse wheel scrolling work when using the GraphicsLayer.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
+
 2010-02-19  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 7bf7dc4..0fd0f1a 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -239,7 +239,10 @@ GraphicsLayerQtImpl::GraphicsLayerQtImpl(GraphicsLayerQt* newLayer)
 {
     // we use graphics-view for compositing, not for interactivity
     setAcceptedMouseButtons(Qt::NoButton);
-    setEnabled(false);
+    // we need to have the item enabled, or else wheel events are not
+    // passed to the parent class implementation of wheelEvent, where
+    // they are ignored and passed to the item below.
+    setEnabled(true);
 
     // we'll set the cache when we know what's going on
     setCacheMode(NoCache);

-- 
WebKit Debian packaging