linux: re-enable test plugin code for X events

webkit/tools/npapi_layout_test_plugin/main.cpp

 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation,
  modification or redistribution of this Apple software constitutes acceptance of these
  terms.  If you do not agree with these terms, please do not use, install, modify or
  redistribute this Apple software.
 
  In consideration of your agreement to abide by the following terms, and subject to these
  terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in
  this original Apple software (the "Apple Software"), to use, reproduce, modify and
@@ skipping 16 matching lines @@
  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
           OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,
  REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND
  WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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
 #define strcasecmp _stricmp
 #define NPAPI WINAPI
 #else
 #define NPAPI
 #endif
 
+#if defined(OS_LINUX)
+#include <X11/Xlib.h>
+#endif
+
 static void log(NPP instance, const char* format, ...)
 {
     va_list args;
     va_start(args, format);
     char message[2048] = "PLUGIN: ";
     vsprintf(message + strlen(message), format, args);
     va_end(args);
 
     NPObject* windowObject = 0;
     NPError error = browser->getvalue(instance, NPNVWindowNPObject, &windowObject);
@@ skipping 265 matching lines @@
             break;
         case WM_KILLFOCUS:
             log(instance, "loseFocusEvent");
             break;
         default:
             log(instance, "event %d", evt->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);
     switch (evt->type) {
         case ButtonPress:
             log(instance, "mouseDown at (%d, %d)", bpress_evt->x, bpress_evt->y);
             break;
         case ButtonRelease:
             log(instance, "mouseUp at (%d, %d)", brelease_evt->x, brelease_evt->y);
             break;
@@ skipping 18 matching lines @@
         case EnterNotify:
         case LeaveNotify:
         case MotionNotify:
             log(instance, "adjustCursorEvent");
             break;
         default:
             log(instance, "event %d", evt->type);
     }
 
     fflush(stdout);
-#endif  // XLIB_TEMPORARILY_DISABLED
-
 #else
     EventRecord* evt = static_cast<EventRecord*>(event);
     Point pt = { evt->where.v, evt->where.h };
     switch (evt->what) {
         case nullEvent:
             // these are delivered non-deterministically, don't log.
             break;
         case mouseDown:
             GlobalToLocal(&pt);
             log(instance, "mouseDown at (%d, %d)", pt.h, pt.v);
@@ skipping 109 matching lines @@
 const char* NP_GetMIMEDescription(void) {
     // The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html
     // asserts that the number of mimetypes handled by plugins should be
     // greater than the number of plugins.  This isn't true if we're
     // the only plugin and we only handle one mimetype, so specify
     // multiple mimetypes here.
     return "application/x-webkit-test-netscape:testnetscape:test netscape content;"
            "application/x-webkit-test-netscape2:testnetscape2:test netscape content2";
 }
 #endif