[Chromium] Add click count and modifiers to the factory method of mouse event.

https://bugs.webkit.org/show_bug.cgi?id=82502

Modify WebInputEventFactory::mouseEvent() to take click count
and modifiers from input parameters. Sample use cases of these
are double click, triple click, Ctrl+click, etc.

Patch by Bolin Hsu <bhsu@google.com> on 2012-04-03
Reviewed by Eric Seidel.

* public/android/WebInputEventFactory.h:
* src/android/WebInputEventFactory.cpp:
(WebKit::WebInputEventFactory::mouseEvent):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 8a44329..ac1ea0f 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-03  Bolin Hsu  <bhsu@google.com>
+
+        [Chromium] Add click count and modifiers to the factory method of mouse event.
+        https://bugs.webkit.org/show_bug.cgi?id=82502
+
+        Modify WebInputEventFactory::mouseEvent() to take click count
+        and modifiers from input parameters. Sample use cases of these
+        are double click, triple click, Ctrl+click, etc.
+
+        Reviewed by Eric Seidel.
+
+        * public/android/WebInputEventFactory.h:
+        * src/android/WebInputEventFactory.cpp:
+        (WebKit::WebInputEventFactory::mouseEvent):
+
 2012-04-03  Mark Pilgrim  <pilgrim@chromium.org>
 
         Call incrementStatsCounter directly

diff --git a/Source/WebKit/chromium/public/android/WebInputEventFactory.h b/Source/WebKit/chromium/public/android/WebInputEventFactory.h
index d49be41..fb52787 100644 (file)
--- a/Source/WebKit/chromium/public/android/WebInputEventFactory.h
+++ b/Source/WebKit/chromium/public/android/WebInputEventFactory.h
@@ -59,6 +59,8 @@ public:
                                                   int windowY,
                                                   MouseEventType,
                                                   double timeStampSeconds,
+                                                  int modifiers,
+                                                  int clickCount,
                                                   WebMouseEvent::Button = WebMouseEvent::ButtonLeft);
 };
 

diff --git a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
index 18e14bf..13166f3 100644 (file)
--- a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
+++ b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp
@@ -70,6 +70,8 @@ WebMouseEvent WebInputEventFactory::mouseEvent(int x, int y,
                                                int windowX, int windowY,
                                                MouseEventType type,
                                                double timeStampSeconds,
+                                               int modifiers,
+                                               int clickCount,
                                                WebMouseEvent::Button button)
 {
     WebMouseEvent result;
@@ -82,7 +84,8 @@ WebMouseEvent WebInputEventFactory::mouseEvent(int x, int y,
     result.globalX = windowX;
     result.globalY = windowY;
     result.timeStampSeconds = timeStampSeconds;
-    result.clickCount = 1;
+    result.clickCount = clickCount;
+    result.modifiers = modifiers;
 
     switch (type) {
     case MouseEventTypeDown: