Title: [103252] trunk/Source/WebKit/efl
- Revision
- 103252
- Author
- k...@profusion.mobi
- Date
- 2011-12-19 12:00:45 -0800 (Mon, 19 Dec 2011)
Log Message
Unreviewed; fix the build with ENABLE(TOUCH_EVENTS) after r103167.
This partly reverts r102297: the Touch{Start,Move,End,Cancel} events
are not in a separate enum anymore (they are part of
WebCore::PlatformEvent), so the assertions in AssertMatchingEnums.cpp
always fail. Setting EWK_TOUCH_START to TouchStart feels even more
hackish, so we just convert the types manually again for now.
* WebCoreSupport/AssertMatchingEnums.cpp:
* ewk/ewk_frame.cpp:
(ewk_frame_feed_touch_event):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (103251 => 103252)
--- trunk/Source/WebKit/efl/ChangeLog 2011-12-19 19:49:27 UTC (rev 103251)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-12-19 20:00:45 UTC (rev 103252)
@@ -1,3 +1,17 @@
+2011-12-19 Raphael Kubo da Costa <k...@profusion.mobi>
+
+ Unreviewed; fix the build with ENABLE(TOUCH_EVENTS) after r103167.
+
+ This partly reverts r102297: the Touch{Start,Move,End,Cancel} events
+ are not in a separate enum anymore (they are part of
+ WebCore::PlatformEvent), so the assertions in AssertMatchingEnums.cpp
+ always fail. Setting EWK_TOUCH_START to TouchStart feels even more
+ hackish, so we just convert the types manually again for now.
+
+ * WebCoreSupport/AssertMatchingEnums.cpp:
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_feed_touch_event):
+
2011-12-17 Sam Weinig <s...@webkit.org>
Make PlatformTouchEvent inherit from PlatformEvent
Modified: trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp (103251 => 103252)
--- trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp 2011-12-19 19:49:27 UTC (rev 103251)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp 2011-12-19 20:00:45 UTC (rev 103252)
@@ -48,11 +48,6 @@
COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_SELECTION_RANGE, VisibleSelection::RangeSelection);
#if ENABLE(TOUCH_EVENTS)
-COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_START, TouchStart);
-COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_MOVE, TouchMove);
-COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_END, TouchEnd);
-COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_CANCEL, TouchCancel);
-
COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_POINT_RELEASED, PlatformTouchPoint::TouchReleased);
COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_POINT_PRESSED, PlatformTouchPoint::TouchPressed);
COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_POINT_MOVED, PlatformTouchPoint::TouchMoved);
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (103251 => 103252)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-12-19 19:49:27 UTC (rev 103251)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-12-19 20:00:45 UTC (rev 103252)
@@ -24,6 +24,7 @@
#include "config.h"
#include "ewk_frame.h"
+#include "Assertions.h"
#include "DocumentLoader.h"
#include "DocumentMarkerController.h"
#include "EventHandler.h"
@@ -39,6 +40,7 @@
#include "HitTestResult.h"
#include "IntSize.h"
#include "KURL.h"
+#include "PlatformEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
#include "PlatformTouchEvent.h"
@@ -946,7 +948,27 @@
Evas_Coord x, y;
evas_object_geometry_get(smartData->view, &x, &y, 0, 0);
- WebCore::PlatformTouchEvent touchEvent(points, WebCore::IntPoint(x, y), static_cast<WebCore::PlatformEvent::Type>(action), metaState);
+ WebCore::PlatformEvent::Type type;
+ switch (action)
+ {
+ case EWK_TOUCH_START:
+ type = WebCore::PlatformEvent::TouchStart;
+ break;
+ case EWK_TOUCH_MOVE:
+ type = WebCore::PlatformEvent::TouchMove;
+ break;
+ case EWK_TOUCH_END:
+ type = WebCore::PlatformEvent::TouchEnd;
+ break;
+ case EWK_TOUCH_CANCEL:
+ type = WebCore::PlatformEvent::TouchCancel;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ return false;
+ }
+
+ WebCore::PlatformTouchEvent touchEvent(points, WebCore::IntPoint(x, y), type, metaState);
return smartData->frame->eventHandler()->handleTouchEvent(touchEvent);
#else
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
