Title: [136325] trunk/Source/WebKit/chromium
- Revision
- 136325
- Author
- rjkro...@chromium.org
- Date
- 2012-12-02 02:42:17 -0800 (Sun, 02 Dec 2012)
Log Message
[chromium] make sourceDevice available to more WebGestureEvent subtypes
https://bugs.webkit.org/show_bug.cgi?id=103551
Reviewed by James Robinson.
Added an additional data payload to WebGestureEvent that can
contain the source device (touchpad or touchscreen).
* public/WebInputEvent.h:
* src/WebInputEvent.cpp:
(SameSizeAsWebGestureEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (136324 => 136325)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-02 10:39:51 UTC (rev 136324)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-02 10:42:17 UTC (rev 136325)
@@ -1,3 +1,17 @@
+2012-12-02 Robert Kroeger <rjkro...@chromium.org>
+
+ [chromium] make sourceDevice available to more WebGestureEvent subtypes
+ https://bugs.webkit.org/show_bug.cgi?id=103551
+
+ Reviewed by James Robinson.
+
+ Added an additional data payload to WebGestureEvent that can
+ contain the source device (touchpad or touchscreen).
+
+ * public/WebInputEvent.h:
+ * src/WebInputEvent.cpp:
+ (SameSizeAsWebGestureEvent):
+
2012-12-02 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r136236.
Modified: trunk/Source/WebKit/chromium/public/WebInputEvent.h (136324 => 136325)
--- trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-12-02 10:39:51 UTC (rev 136324)
+++ trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-12-02 10:42:17 UTC (rev 136325)
@@ -379,6 +379,7 @@
int y;
int globalX;
int globalY;
+ SourceDevice sourceDevice;
union {
struct {
@@ -412,6 +413,7 @@
struct {
float velocityX;
float velocityY;
+ // FIXME: Remove this when Chromium uses the top-level field.
SourceDevice sourceDevice;
} flingStart;
Modified: trunk/Source/WebKit/chromium/src/WebInputEvent.cpp (136324 => 136325)
--- trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-12-02 10:39:51 UTC (rev 136324)
+++ trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-12-02 10:42:17 UTC (rev 136325)
@@ -60,7 +60,7 @@
};
struct SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent {
- int gestureData[8];
+ int gestureData[9];
};
struct SameSizeAsWebTouchEvent : public SameSizeAsWebInputEvent {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
