From d0424a769059c84ae20beb3c217812792ea6726b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Sep 2012 16:29:47 +0200 Subject: Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608) New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make --- .../WebKit/chromium/src/android/WebInputEventFactory.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Source/WebKit/chromium/src/android/WebInputEventFactory.cpp') diff --git a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp index 9bc70faca..d0db5fa9d 100644 --- a/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp +++ b/Source/WebKit/chromium/src/android/WebInputEventFactory.cpp @@ -148,12 +148,21 @@ WebMouseWheelEvent WebInputEventFactory::mouseWheelEvent(MouseWheelDirectionType // WebGestureEvent ------------------------------------------------------------ +// FIXME: remove this obsolete version +WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type, + double timeStampSeconds, + int x, + int y, + float, + float, + int modifiers) { + return gestureEvent(type, timeStampSeconds, x, y, modifiers); +} + WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type, double timeStampSeconds, int x, int y, - float deltaX, - float deltaY, int modifiers) { WebGestureEvent result; @@ -161,8 +170,6 @@ WebGestureEvent WebInputEventFactory::gestureEvent(WebInputEvent::Type type, result.type = type; result.x = x; result.y = y; - result.deltaX = deltaX; - result.deltaY = deltaY; result.timeStampSeconds = timeStampSeconds; result.modifiers = modifiers; -- cgit v1.2.1