Index: Source/WebCore/plugins/PluginView.h
===================================================================
--- Source/WebCore/plugins/PluginView.h	(revision 79526)
+++ Source/WebCore/plugins/PluginView.h	(revision 84071)
@@ -391,5 +391,5 @@
 private:
 
-#if defined(XP_UNIX) || OS(SYMBIAN)
+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
         void setNPWindowIfNeeded();
 #elif defined(XP_MACOSX)
Index: Source/WebCore/plugins/gtk/PluginViewGtk.cpp
===================================================================
--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp	(revision 82962)
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp	(revision 84071)
@@ -47,6 +47,7 @@
 #include "Image.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
+#include "NotImplemented.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
@@ -663,5 +664,5 @@
             *static_cast<Window*>(value) = GDK_WINDOW_XWINDOW(gdk_window_get_toplevel(gdkWindow));
 #elif defined(GDK_WINDOWING_WIN32)
-            *static_cast<HGIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
+            *static_cast<HGDIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow);
 #endif
             *result = NPERR_NO_ERROR;
@@ -709,4 +710,5 @@
 }
 
+#ifndef GDK_WINDOWING_WIN32
 static Display* getPluginDisplay()
 {
@@ -722,4 +724,5 @@
 #endif
 }
+#endif
 
 #if defined(XP_UNIX)
@@ -786,4 +789,5 @@
     ASSERT(m_status == PluginStatusLoadedSuccessfully);
 
+#if defined(XP_UNIX)
     if (m_plugin->pluginFuncs()->getvalue) {
         PluginView::setCurrentPluginView(this);
@@ -794,9 +798,9 @@
         PluginView::setCurrentPluginView(0);
     }
+#endif
 
     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
@@ -820,5 +824,7 @@
     } else {
         setPlatformWidget(0);
+#if defined(XP_UNIX)
         m_pluginDisplay = getPluginDisplay();
+#endif
     }
 
Index: Source/WebCore/plugins/PluginView.cpp
===================================================================
--- Source/WebCore/plugins/PluginView.cpp	(revision 79988)
+++ Source/WebCore/plugins/PluginView.cpp	(revision 84071)
@@ -341,5 +341,5 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-#ifdef XP_WIN
+#if defined(XP_WIN) && !PLATFORM(GTK)
     // Unsubclass the window
     if (m_isWindowed) {
@@ -356,5 +356,5 @@
 #endif
     }
-#endif // XP_WIN
+#endif // !defined(XP_WIN) || PLATFORM(GTK)
 #endif // ENABLE(NETSCAPE_PLUGIN_API)