Title: [115338] trunk/Tools
- Revision
- 115338
- Author
- [email protected]
- Date
- 2012-04-26 12:01:49 -0700 (Thu, 26 Apr 2012)
Log Message
Unreviewed. Fix GTK+ build after r115314.
For some reason it fails while bulding GtkVersioning for WTR, but
it didn't fail neither in EWS nor in my laptop. We don't really
need GtkVersioning in WTR since it already depends on GTK+3
unconditionally.
* WebKitTestRunner/GNUmakefile.am: Remove GtkVersioning.c from
compilation.
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
(WTR::EventSenderProxy::createMouseButtonEvent): Use GTK+ 3 API
directly instead of getDefaultGDKPointerDevice() helper.
(WTR::EventSenderProxy::keyDown): Ditto.
(WTR::EventSenderProxy::mouseMoveTo): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (115337 => 115338)
--- trunk/Tools/ChangeLog 2012-04-26 18:47:18 UTC (rev 115337)
+++ trunk/Tools/ChangeLog 2012-04-26 19:01:49 UTC (rev 115338)
@@ -1,3 +1,20 @@
+2012-04-26 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build after r115314.
+
+ For some reason it fails while bulding GtkVersioning for WTR, but
+ it didn't fail neither in EWS nor in my laptop. We don't really
+ need GtkVersioning in WTR since it already depends on GTK+3
+ unconditionally.
+
+ * WebKitTestRunner/GNUmakefile.am: Remove GtkVersioning.c from
+ compilation.
+ * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+ (WTR::EventSenderProxy::createMouseButtonEvent): Use GTK+ 3 API
+ directly instead of getDefaultGDKPointerDevice() helper.
+ (WTR::EventSenderProxy::keyDown): Ditto.
+ (WTR::EventSenderProxy::mouseMoveTo): Ditto.
+
2012-04-24 Ojan Vafai <[email protected]>
Show flakiness dashboard data in garden-o-matic
Modified: trunk/Tools/WebKitTestRunner/GNUmakefile.am (115337 => 115338)
--- trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-04-26 18:47:18 UTC (rev 115337)
+++ trunk/Tools/WebKitTestRunner/GNUmakefile.am 2012-04-26 19:01:49 UTC (rev 115338)
@@ -27,8 +27,7 @@
Tools/WebKitTestRunner/TestController.h \
Tools/WebKitTestRunner/TestInvocation.cpp \
Tools/WebKitTestRunner/TestInvocation.h \
- Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h \
- Source/WebCore/platform/gtk/GtkVersioning.c
+ Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h
Programs_WebKitTestRunner_CPPFLAGS = \
-include Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h \
Modified: trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (115337 => 115338)
--- trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2012-04-26 18:47:18 UTC (rev 115337)
+++ trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2012-04-26 19:01:49 UTC (rev 115338)
@@ -35,7 +35,6 @@
#include "PlatformWebView.h"
#include "TestController.h"
-#include <GtkVersioning.h>
#include <wtf/OwnArrayPtr.h>
#include <wtf/PassOwnArrayPtr.h>
#include <gdk/gdkkeysyms.h>
@@ -113,7 +112,7 @@
mouseEvent->button.y = m_position.y;
mouseEvent->button.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(mouseEvent->button.window);
- mouseEvent->button.device = getDefaultGDKPointerDevice(mouseEvent->button.window);
+ gdk_event_set_device(mouseEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(mouseEvent->button.window))));
mouseEvent->button.state = modifiers | getMouseButtonModifiers(mouseEvent->button.button);
mouseEvent->button.time = GDK_CURRENT_TIME;
mouseEvent->button.axes = 0;
@@ -289,7 +288,7 @@
pressEvent->key.state = modifiers;
pressEvent->key.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformWindow()));
g_object_ref(pressEvent->key.window);
- gdk_event_set_device(pressEvent, getDefaultGDKPointerDevice(pressEvent->key.window));
+ gdk_event_set_device(pressEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(pressEvent->key.window))));
GOwnPtr<GdkKeymapKey> keys;
gint nKeys;
@@ -358,7 +357,7 @@
event->motion.time = GDK_CURRENT_TIME;
event->motion.window = gtk_widget_get_window(GTK_WIDGET(m_testController->mainWebView()->platformView()));
g_object_ref(event->motion.window);
- event->button.device = getDefaultGDKPointerDevice(event->motion.window);
+ gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(event->motion.window))));
event->motion.state = 0 | getMouseButtonModifiers(m_mouseButtonCurrentlyDown);
event->motion.axes = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
