1 files changed, 11 insertions, 9 deletions
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 5be7d1f..d007d64 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -58,11 +58,15 @@ typedef struct PluginWidgetAndroid* PlatformPluginWidget;
 typedef PlatformWidget PlatformPluginWidget;
 #endif
 
+#if USE(JSC)
 namespace JSC {
     namespace Bindings {
         class Instance;
     }
 }
+#endif
+
+class NPObject;
 
 namespace WebCore {
     class Element;
@@ -124,7 +128,11 @@ namespace WebCore {
         void setNPWindowRect(const IntRect&);
         static PluginView* currentPluginView();
 
+#if USE(JSC)
         PassRefPtr<JSC::Bindings::Instance> bindingInstance();
+#elif USE(V8)
+        NPObject* getNPObject();
+#endif
 
         PluginStatus status() const { return m_status; }
 
@@ -199,11 +207,6 @@ namespace WebCore {
 
         static bool isCallingPlugin();
 
-#if PLATFORM(QT)
-        bool isNPAPIPlugin() const { return m_isNPAPIPlugin; }
-        void setIsNPAPIPlugin(bool b) { m_isNPAPIPlugin = b; }
-#endif
-
     private:
         PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
 
@@ -284,10 +287,6 @@ namespace WebCore {
         bool m_isTransparent;
         bool m_haveInitialized;
 
-#if PLATFORM(QT)
-        bool m_isNPAPIPlugin;
-#endif
-
 #if PLATFORM(GTK) || defined(Q_WS_X11)
         bool m_needsXEmbed;
 #endif
@@ -330,6 +329,9 @@ private:
         void nullEventTimerFired(Timer<PluginView>*);
         Point globalMousePosForPlugin() const;
 #endif
+#if PLATFORM(GTK) || defined(Q_WS_X11)
+        void setNPWindowIfNeeded();
+#endif
 
         IntRect m_clipRect; // The clip rect to apply to a windowed plug-in
         IntRect m_windowRect; // Our window rect.