diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 02:34:20 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 02:34:20 +0000 |
| commit | 47c6907ccd508bd7d914e9c783d4b06640986165 (patch) | |
| tree | 993476bfdba8f59ac0edbbd0d8764c0f7dddf012 /webkit/tools/npapi_layout_test_plugin/main.cpp | |
| parent | cc9f43849499b4d0b42f199379848d472ccb6c1b (diff) | |
| download | chromium_src-47c6907ccd508bd7d914e9c783d4b06640986165.zip chromium_src-47c6907ccd508bd7d914e9c783d4b06640986165.tar.gz chromium_src-47c6907ccd508bd7d914e9c783d4b06640986165.tar.bz2 | |
linux: re-enable test plugin code for X events
This code was written months ago, but temporarily disabled due
to build issues. Let's see if the buildbots like it now!
Review URL: http://codereview.chromium.org/155036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/npapi_layout_test_plugin/main.cpp')
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/main.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
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 }; |