- Revision
- 128378
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-12 16:17:00 -0700 (Wed, 12 Sep 2012)
Log Message
[chromium] Remove unused WebGestureEvent fields
https://bugs.webkit.org/show_bug.cgi?id=95496
Patch by Rick Byers <rby...@chromium.org> on 2012-09-12
Reviewed by Adam Barth.
Remove the no-longer used fields from WebGestureEvent, now that
chromium has been updated to use the per-event-type fields instead.
This depends on crrev.com/156346 in chromium.
* public/WebInputEvent.h:
(WebKit::WebGestureEvent::WebGestureEvent):
* public/android/WebInputEventFactory.h:
* src/WebInputEvent.cpp:
(SameSizeAsWebGestureEvent):
* src/android/WebInputEventFactory.cpp:
(WebKit):
(WebKit::WebInputEventFactory::gestureEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (128377 => 128378)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 23:10:11 UTC (rev 128377)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-12 23:17:00 UTC (rev 128378)
@@ -1,3 +1,23 @@
+2012-09-12 Rick Byers <rby...@chromium.org>
+
+ [chromium] Remove unused WebGestureEvent fields
+ https://bugs.webkit.org/show_bug.cgi?id=95496
+
+ Reviewed by Adam Barth.
+
+ Remove the no-longer used fields from WebGestureEvent, now that
+ chromium has been updated to use the per-event-type fields instead.
+ This depends on crrev.com/156346 in chromium.
+
+ * public/WebInputEvent.h:
+ (WebKit::WebGestureEvent::WebGestureEvent):
+ * public/android/WebInputEventFactory.h:
+ * src/WebInputEvent.cpp:
+ (SameSizeAsWebGestureEvent):
+ * src/android/WebInputEventFactory.cpp:
+ (WebKit):
+ (WebKit::WebInputEventFactory::gestureEvent):
+
2012-09-12 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r128351.
Modified: trunk/Source/WebKit/chromium/public/WebInputEvent.h (128377 => 128378)
--- trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-09-12 23:10:11 UTC (rev 128377)
+++ trunk/Source/WebKit/chromium/public/WebInputEvent.h 2012-09-12 23:17:00 UTC (rev 128378)
@@ -378,12 +378,6 @@
int globalX;
int globalY;
- // FIXME: These are currently overloaded. We're in the process of moving
- // to the union below. http://wkb.ug/93123
- float deltaX;
- float deltaY;
- WebRect boundingBox;
-
union {
struct {
int tapCount;
@@ -420,8 +414,6 @@
, y(0)
, globalX(0)
, globalY(0)
- , deltaX(0.0f)
- , deltaY(0.0f)
{
memset(&data, 0, sizeof(data));
}
Modified: trunk/Source/WebKit/chromium/public/android/WebInputEventFactory.h (128377 => 128378)
--- trunk/Source/WebKit/chromium/public/android/WebInputEventFactory.h 2012-09-12 23:10:11 UTC (rev 128377)
+++ trunk/Source/WebKit/chromium/public/android/WebInputEventFactory.h 2012-09-12 23:17:00 UTC (rev 128378)
@@ -81,6 +81,11 @@
float deltaY,
int modifiers);
+ WEBKIT_EXPORT static WebGestureEvent gestureEvent(WebInputEvent::Type,
+ double timeStampSeconds,
+ int x,
+ int y,
+ int modifiers);
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebInputEvent.cpp (128377 => 128378)
--- trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-09-12 23:10:11 UTC (rev 128377)
+++ trunk/Source/WebKit/chromium/src/WebInputEvent.cpp 2012-09-12 23:17:00 UTC (rev 128378)
@@ -60,7 +60,7 @@
};
struct SameSizeAsWebGestureEvent : public SameSizeAsWebInputEvent {
- int gestureData[14];
+ int gestureData[8];
};
struct SameSizeAsWebTouchEvent : public SameSizeAsWebInputEvent {
Modified: trunk/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp (128377 => 128378)
--- trunk/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp 2012-09-12 23:10:11 UTC (rev 128377)
+++ trunk/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp 2012-09-12 23:17:00 UTC (rev 128378)
@@ -148,12 +148,21 @@
// WebGestureEvent ------------------------------------------------------------
+// FIXME: remove this obsolete version
WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type,
double timeStampSeconds,
int x,
int y,
- float deltaX,
- float deltaY,
+ float,
+ float,
+ int modifiers) {
+ return gestureEvent(type, timeStampSeconds, x, y, modifiers);
+}
+
+WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type,
+ double timeStampSeconds,
+ int x,
+ int y,
int modifiers)
{
WebGestureEvent result;
@@ -161,8 +170,6 @@
result.type = type;
result.x = x;
result.y = y;
- result.deltaX = deltaX;
- result.deltaY = deltaY;
result.timeStampSeconds = timeStampSeconds;
result.modifiers = modifiers;
