Diff
Modified: trunk/Source/WebCore/ChangeLog (98942 => 98943)
--- trunk/Source/WebCore/ChangeLog 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebCore/ChangeLog 2011-11-01 09:54:24 UTC (rev 98943)
@@ -1,3 +1,12 @@
+2011-11-01 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [WK2] Add WebGestureEvents to the Qt build and enable PlatformGestureEvent::TapType
+ https://bugs.webkit.org/show_bug.cgi?id=71274
+
+ Reviewed by Kenneth Christiansen.
+
+ * features.pri: Enable GESTURE_EVENTS.
+
2011-11-01 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r98847.
Modified: trunk/Source/WebCore/features.pri (98942 => 98943)
--- trunk/Source/WebCore/features.pri 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebCore/features.pri 2011-11-01 09:54:24 UTC (rev 98943)
@@ -144,6 +144,7 @@
}
!contains(DEFINES, ENABLE_TOUCH_EVENTS=.): DEFINES += ENABLE_TOUCH_EVENTS=1
+!contains(DEFINES, ENABLE_GESTURE_EVENTS=.): DEFINES += ENABLE_GESTURE_EVENTS=1
# HTML5 Media Support
# We require QtMultimedia
@@ -197,6 +198,7 @@
contains(DEFINES, ENABLE_WEB_SOCKETS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
contains(DEFINES, ENABLE_WEB_TIMING=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_TIMING=1
contains(DEFINES, ENABLE_TOUCH_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_TOUCH_EVENTS=1
+contains(DEFINES, ENABLE_GESTURE_EVENTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_GESTURE_EVENTS=1
contains(DEFINES, WTF_USE_TILED_BACKING_STORE=1): FEATURE_DEFINES_JAVASCRIPT += WTF_USE_TILED_BACKING_STORE=1
contains(DEFINES, ENABLE_NOTIFICATIONS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_NOTIFICATIONS=1
contains(DEFINES, ENABLE_DETAILS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DETAILS=1
Modified: trunk/Source/WebKit2/ChangeLog (98942 => 98943)
--- trunk/Source/WebKit2/ChangeLog 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-01 09:54:24 UTC (rev 98943)
@@ -1,3 +1,18 @@
+2011-11-01 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [WK2] Add WebGestureEvents to the Qt build and enable PlatformGestureEvent::TapType
+ https://bugs.webkit.org/show_bug.cgi?id=71274
+
+ Reviewed by Kenneth Christiansen.
+
+ * Shared/WebEvent.h: Add GestureSingleTap as gesture type.
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformGestureEvent::WebKit2PlatformGestureEvent): Support converting
+ WebEven::GestureSingleTap to PlatformGestureEvent::TapType.
+ * Shared/WebGestureEvent.cpp:
+ (WebKit::WebGestureEvent::isGestureEventType): GestureSingleTap is a valid gesture event type.
+ * WebKit2.pro: Add WebGestureEvent.cpp to the build.
+
2011-10-31 Anders Carlsson <ander...@apple.com>
PluginProxy::Update should pass the painted rect in plug-in coordinates
Modified: trunk/Source/WebKit2/Shared/WebEvent.h (98942 => 98943)
--- trunk/Source/WebKit2/Shared/WebEvent.h 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebKit2/Shared/WebEvent.h 2011-11-01 09:54:24 UTC (rev 98943)
@@ -63,6 +63,7 @@
// WebGestureEvent
GestureScrollBegin,
GestureScrollEnd,
+ GestureSingleTap,
#endif
#if ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (98942 => 98943)
--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2011-11-01 09:54:24 UTC (rev 98943)
@@ -182,6 +182,9 @@
case WebEvent::GestureScrollEnd:
m_type = PlatformGestureEvent::ScrollEndType;
break;
+ case WebEvent::GestureSingleTap:
+ m_type = PlatformGestureEvent::TapType;
+ break;
default:
ASSERT_NOT_REACHED();
}
Modified: trunk/Source/WebKit2/Shared/WebGestureEvent.cpp (98942 => 98943)
--- trunk/Source/WebKit2/Shared/WebGestureEvent.cpp 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebKit2/Shared/WebGestureEvent.cpp 2011-11-01 09:54:24 UTC (rev 98943)
@@ -64,7 +64,7 @@
bool WebGestureEvent::isGestureEventType(Type type)
{
- return type == GestureScrollBegin || type == GestureScrollEnd;
+ return type == GestureScrollBegin || type == GestureScrollEnd || type == GestureSingleTap;
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebKit2.pro (98942 => 98943)
--- trunk/Source/WebKit2/WebKit2.pro 2011-11-01 09:54:07 UTC (rev 98942)
+++ trunk/Source/WebKit2/WebKit2.pro 2011-11-01 09:54:24 UTC (rev 98943)
@@ -400,6 +400,7 @@
Shared/WebError.cpp \
Shared/WebEvent.cpp \
Shared/WebEventConversion.cpp \
+ Shared/WebGestureEvent.cpp \
Shared/WebGeolocationPosition.cpp \
Shared/WebGraphicsContext.cpp \
Shared/WebHitTestResult.cpp \
