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

[darin at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0dc86e46c62bbefca8b789aa0c0ce27624739c28
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 18:39:31 2010 +0000

    2010-07-22  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Propagate return value of EventHandler::handleMouseWheelEvent
            to caller of WebViewImpl::handleInputEvent.
    
            https://bugs.webkit.org/show_bug.cgi?id=42835
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::mouseWheel):
            (WebKit::WebViewImpl::handleInputEvent):
            * src/WebViewImpl.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63905 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 41a6452..511a34a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,19 @@
 2010-07-22  Darin Fisher  <darin at chromium.org>
 
+        Reviewed by David Levin.
+
+        [Chromium] Propagate return value of EventHandler::handleMouseWheelEvent
+        to caller of WebViewImpl::handleInputEvent.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42835
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::mouseWheel):
+        (WebKit::WebViewImpl::handleInputEvent):
+        * src/WebViewImpl.h:
+
+2010-07-22  Darin Fisher  <darin at chromium.org>
+
         Reviewed by Kent Tamura.
 
         https://bugs.webkit.org/show_bug.cgi?id=42808
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 83c8822..b8b8599 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -489,10 +489,10 @@ void WebViewImpl::mouseUp(const WebMouseEvent& event)
 #endif
 }
 
-void WebViewImpl::mouseWheel(const WebMouseWheelEvent& event)
+bool WebViewImpl::mouseWheel(const WebMouseWheelEvent& event)
 {
     PlatformWheelEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
-    mainFrameImpl()->frame()->eventHandler()->handleWheelEvent(platformEvent);
+    return mainFrameImpl()->frame()->eventHandler()->handleWheelEvent(platformEvent);
 }
 
 bool WebViewImpl::keyEvent(const WebKeyboardEvent& event)
@@ -1018,7 +1018,7 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
         break;
 
     case WebInputEvent::MouseWheel:
-        mouseWheel(*static_cast<const WebMouseWheelEvent*>(&inputEvent));
+        handled = mouseWheel(*static_cast<const WebMouseWheelEvent*>(&inputEvent));
         break;
 
     case WebInputEvent::MouseDown:
diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h
index 312f20f..d4e1113 100644
--- a/WebKit/chromium/src/WebViewImpl.h
+++ b/WebKit/chromium/src/WebViewImpl.h
@@ -239,7 +239,7 @@ public:
     void mouseUp(const WebMouseEvent&);
     void mouseContextMenu(const WebMouseEvent&);
     void mouseDoubleClick(const WebMouseEvent&);
-    void mouseWheel(const WebMouseWheelEvent&);
+    bool mouseWheel(const WebMouseWheelEvent&);
     bool keyEvent(const WebKeyboardEvent&);
     bool charEvent(const WebKeyboardEvent&);
     bool touchEvent(const WebTouchEvent&);

-- 
WebKit Debian packaging