From 6b70adc33054f8aee8c54d0f460458a9df11b8a5 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Thu, 18 Nov 2010 17:33:13 -0800
Subject: Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
---
 WebKit/chromium/src/mac/WebInputEventFactory.mm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'WebKit/chromium/src/mac')

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:
-- 
cgit v1.1