Ticket #24622: patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff

WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -59 +59 @@
 #include "runtime_root.h"
 #include <runtime/JSLock.h>
 #include <runtime/JSValue.h>
+#include "NotImplemented.h"
 
 #include <gdkconfig.h>
 #include <gtk/gtk.h>
 
+#undef XP_UNIX
+
 #if defined(XP_UNIX)
 #include "gtk2xtbin.h"
 #define Bool int // this got undefined somewhere
@@ -440 +443 @@
         event->setDefaultHandled();
 }
 
-#if defined(XP_UNIX)
 void PluginView::handleFocusInEvent()
 {
+#if defined(XP_UNIX)
     XEvent npEvent;
     initXEvent(&npEvent);
 
@@ -452 +455 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
+#endif
 }
 
 void PluginView::handleFocusOutEvent()
 {
+#if defined(XP_UNIX)
     XEvent npEvent;
     initXEvent(&npEvent);
 
@@ -465 +470 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
-}
 #endif
+}
 
 void PluginView::setParent(ScrollView* parent)
 {
@@ -794 +799 @@
     }
 
     if (m_isWindowed) {
-#if defined(XP_UNIX)
         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
+#if defined(XP_UNIX)
 
         if (m_needsXEmbed) {
             // If our parent is not anchored the startup process will