Modified: trunk/Tools/ChangeLog (123598 => 123599)
--- trunk/Tools/ChangeLog 2012-07-25 10:09:16 UTC (rev 123598)
+++ trunk/Tools/ChangeLog 2012-07-25 10:26:31 UTC (rev 123599)
@@ -1,3 +1,19 @@
+2012-07-25 Alexander Shalamov <[email protected]>
+
+ [WTR][EFL] Wheel events are not emitted
+ https://bugs.webkit.org/show_bug.cgi?id=92094
+
+ Reviewed by Csaba Osztrogonác.
+
+ Wheel events are not emitted, therefore, layout tests that use mouseScrollBy method are failing.
+
+ * WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
+ (WTR::dispatchMouseScrollByEvent):
+ (WTR::EventSenderProxy::mouseScrollBy):
+ * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+ (WTR::PlatformWebView::focus):
+
2012-07-25 Mikhail Pozdnyakov <[email protected]>
[EFL][WK2] Add ewk_main.{cpp,h} to EFL WK2
Modified: trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp (123598 => 123599)
--- trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp 2012-07-25 10:09:16 UTC (rev 123598)
+++ trunk/Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp 2012-07-25 10:26:31 UTC (rev 123599)
@@ -169,20 +169,11 @@
static void dispatchMouseScrollByEvent(Evas* evas, int horizontal, int vertical)
{
- const int SCROLLLEFT = -10;
- const int SCROLLRIGHT = 10;
- const int SCROLLDOWN = -10;
- const int SCROLLUP = 10;
+ if (horizontal)
+ evas_event_feed_mouse_wheel(evas, 1, horizontal, 0, 0);
- if (horizontal > 0)
- evas_event_feed_mouse_wheel(evas, 1, SCROLLLEFT, 0, 0);
- else if (horizontal < 0)
- evas_event_feed_mouse_wheel(evas, 1, SCROLLRIGHT, 0, 0);
-
- if (vertical > 0)
- evas_event_feed_mouse_wheel(evas, 0, SCROLLUP, 0, 0);
- else if (vertical < 0)
- evas_event_feed_mouse_wheel(evas, 0, SCROLLDOWN, 0, 0);
+ if (vertical)
+ evas_event_feed_mouse_wheel(evas, 0, vertical, 0, 0);
}
static const PassRefPtr<KeyEventInfo> keyPadName(WKStringRef keyRef)
@@ -374,8 +365,10 @@
void EventSenderProxy::mouseScrollBy(int horizontal, int vertical)
{
WTREvent event(WTREventTypeMouseScrollBy, 0, 0, WTRMouseButtonNone);
- event.horizontal = horizontal;
- event.vertical = vertical;
+ // We need to invert scrolling values since in EFL negative z value means that
+ // canvas is scrolling down
+ event.horizontal = -horizontal;
+ event.vertical = -vertical;
sendOrQueueEvent(event);
}
Modified: trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (123598 => 123599)
--- trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-07-25 10:09:16 UTC (rev 123598)
+++ trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp 2012-07-25 10:26:31 UTC (rev 123599)
@@ -50,6 +50,7 @@
ewk_view_theme_set(m_view, THEME_DIR"/default.edj");
m_windowIsKey = false;
+ evas_object_show(m_view);
}
PlatformWebView::~PlatformWebView()
@@ -70,6 +71,7 @@
void PlatformWebView::focus()
{
+ evas_object_focus_set(m_view, true);
}
WKRect PlatformWebView::windowFrame()
