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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 75a65a098218740f5b4ce60371425042e78de1bf
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 10:02:17 2010 +0000

    2010-11-17  Stuart Morgan  <stuartmorgan at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Fix click count for mouse-up events.
            - clickCount for mouse up was lost in conversion from NSEvent
            - clickCount was also lost when disptaching events through the
            plugin mouse capture event codepath.
    
            https://bugs.webkit.org/show_bug.cgi?id=49290
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::handleInputEvent):
            * src/mac/WebInputEventFactory.mm:
            (WebKit::WebInputEventFactory::mouseEvent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5ff6275..a582aa8 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-17  Stuart Morgan  <stuartmorgan at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix click count for mouse-up events.
+        - clickCount for mouse up was lost in conversion from NSEvent
+        - clickCount was also lost when disptaching events through the
+        plugin mouse capture event codepath.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49290
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleInputEvent):
+        * src/mac/WebInputEventFactory.mm:
+        (WebKit::WebInputEventFactory::mouseEvent):
+
 2010-11-11  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 7bd96d4..29fb562 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1096,7 +1096,7 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
 
         node->dispatchMouseEvent(
               PlatformMouseEventBuilder(mainFrameImpl()->frameView(), *static_cast<const WebMouseEvent*>(&inputEvent)),
-              eventType);
+              eventType, static_cast<const WebMouseEvent*>(&inputEvent)->clickCount);
         m_currentInputEvent = 0;
         return true;
     }
diff --git a/WebKit/chromium/src/mac/WebInputEventFactory.mm b/WebKit/chromium/src/mac/WebInputEventFactory.mm
index 015409e..55883c9 100644
--- a/WebKit/chromium/src/mac/WebInputEventFactory.mm
+++ b/WebKit/chromium/src/mac/WebInputEventFactory.mm
@@ -1016,14 +1016,17 @@ WebMouseEvent WebInputEventFactory::mouseEvent(NSEvent* event, NSView* view)
         break;
     case NSLeftMouseUp:
         result.type = WebInputEvent::MouseUp;
+        result.clickCount = [event clickCount];
         result.button = WebMouseEvent::ButtonLeft;
         break;
     case NSOtherMouseUp:
         result.type = WebInputEvent::MouseUp;
+        result.clickCount = [event clickCount];
         result.button = WebMouseEvent::ButtonMiddle;
         break;
     case NSRightMouseUp:
         result.type = WebInputEvent::MouseUp;
+        result.clickCount = [event clickCount];
         result.button = WebMouseEvent::ButtonRight;
         break;
     case NSMouseMoved:

-- 
WebKit Debian packaging