diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 7 | ||||
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/main.cpp | 16 |
2 files changed, 9 insertions, 14 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 09828e9..4d85512 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1251,6 +1251,9 @@ BUG10666 LINUX : chrome/fast/forms/basic-selects.html = FAIL BUG15797 LINUX : LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL BUG15797 LINUX : LayoutTests/plugins/embed-attributes-setting.html = FAIL +// Linux: mouse events are at the wrong coordinates for plugin. +BUG15907 LINUX : LayoutTests/plugins/mouse-events.html = FAIL + // Depends on plugin support. BUG10351 MAC : LayoutTests/fast/dom/Window/Plug-ins.html = FAIL BUG10351 MAC : LayoutTests/fast/js/navigator-mimeTypes-length.html = FAIL @@ -1270,9 +1273,7 @@ BUG10351 MAC : LayoutTests/plugins/getintidentifier-special-values.html = FAIL BUG10351 MAC : LayoutTests/plugins/geturl-replace-query.html = TIMEOUT BUG10351 MAC : LayoutTests/plugins/inner-html-display-none.html = FAIL BUG10351 MAC : LayoutTests/plugins/invoke.html = FAIL -// Linux: Need to hook up mouse event output in the layout test plugin. -// Code's there, but #ifdef'd out temporarily. -BUG10351 MAC LINUX : LayoutTests/plugins/mouse-events.html = FAIL +BUG10351 MAC : LayoutTests/plugins/mouse-events.html = FAIL BUG10351 MAC : LayoutTests/plugins/netscape-destroy-plugin-script-objects.html = FAIL BUG10351 MAC : LayoutTests/plugins/netscape-dom-access.html = FAIL BUG10351 MAC : LayoutTests/plugins/netscape-get-property-return-value.html = FAIL diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp index 16190db..7b79b08 100644 --- a/webkit/tools/npapi_layout_test_plugin/main.cpp +++ b/webkit/tools/npapi_layout_test_plugin/main.cpp @@ -34,13 +34,6 @@ #include <stdlib.h> #include <stdio.h> #include <wtf/Platform.h> -// The buildbot doesn't have Xlib. Rather than revert this, I've just -// temporarily ifdef'd it out. -#ifdef XLIB_TEMPORARILY_DISABLED -#if PLATFORM(UNIX) -#include <X11/Xlib.h> -#endif -#endif #include "PluginObject.h" #ifdef WIN32 @@ -50,6 +43,10 @@ #define NPAPI #endif +#if defined(OS_LINUX) +#include <X11/Xlib.h> +#endif + static void log(NPP instance, const char* format, ...) { va_list args; @@ -335,8 +332,7 @@ int16 NPP_HandleEvent(NPP instance, void *event) fflush(stdout); -#elif PLATFORM(UNIX) -#ifdef XLIB_TEMPORARILY_DISABLED +#elif defined(OS_LINUX) XEvent* evt = static_cast<XEvent*>(event); XButtonPressedEvent* bpress_evt = reinterpret_cast<XButtonPressedEvent*>(evt); XButtonReleasedEvent* brelease_evt = reinterpret_cast<XButtonReleasedEvent*>(evt); @@ -375,8 +371,6 @@ int16 NPP_HandleEvent(NPP instance, void *event) } fflush(stdout); -#endif // XLIB_TEMPORARILY_DISABLED - #else EventRecord* evt = static_cast<EventRecord*>(event); Point pt = { evt->where.v, evt->where.h }; |