From fc704832a05110d4fb8af4dba20e61d931559a60 Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Thu, 25 Mar 1999 03:31:37 +0000 Subject: [PATCH] implementing nsIPluginInstancePeer2. git-svn-id: svn://10.0.0.236/trunk@25034 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp | 5 ++--- mozilla/modules/plugin/base/src/nsPluginInstancePeer.h | 8 +++++--- mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp | 5 ++--- mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.h | 8 +++++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp index 0209766067c..1baa758bc5f 100644 --- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp @@ -62,7 +62,6 @@ nsPluginInstancePeerImpl :: ~nsPluginInstancePeerImpl() static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); -static NS_DEFINE_IID(kIPluginInstancePeerIID, NS_IPLUGININSTANCEPEER_IID); static NS_DEFINE_IID(kIJVMPluginTagInfoIID, NS_IJVMPLUGINTAGINFO_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); @@ -74,9 +73,9 @@ nsresult nsPluginInstancePeerImpl :: QueryInterface(const nsIID& iid, void** ins if (instance == NULL) return NS_ERROR_NULL_POINTER; - if (iid.Equals(kIPluginInstancePeerIID)) + if (iid.Equals(nsIPluginInstancePeer::GetIID()) || iid.Equals(nsIPluginInstancePeer2::GetIID())) { - *instance = (void *)(nsIPluginInstancePeer *)this; + *instance = (void *)(nsIPluginInstancePeer2*)this; AddRef(); return NS_OK; } diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.h b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.h index 2547a2b7872..5d28a95c25c 100644 --- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.h +++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.h @@ -19,14 +19,14 @@ #ifndef nsPluginInstancePeer_h___ #define nsPluginInstancePeer_h___ -#include "nsIPluginInstancePeer.h" +#include "nsIPluginInstancePeer2.h" #include "nsIWindowlessPlugInstPeer.h" #include "nsIPluginTagInfo.h" #include "nsIPluginInstanceOwner.h" #include "nsIJVMPluginTagInfo.h" -class nsPluginInstancePeerImpl : public nsIPluginInstancePeer, +class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2, public nsIWindowlessPluginInstancePeer, public nsIPluginTagInfo2, public nsIJVMPluginTagInfo @@ -38,7 +38,7 @@ public: NS_DECL_ISUPPORTS - //nsIPluginInstancePeer interface + // nsIPluginInstancePeer interface NS_IMETHOD GetValue(nsPluginInstancePeerVariable variable, void *value); @@ -58,6 +58,8 @@ public: NS_IMETHOD SetWindowSize(PRUint32 width, PRUint32 height); + // nsIPluginInstancePeer2 interface + NS_IMETHOD GetJSWindow(JSObject* *outJSWindow); diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp index 0209766067c..1baa758bc5f 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp @@ -62,7 +62,6 @@ nsPluginInstancePeerImpl :: ~nsPluginInstancePeerImpl() static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); -static NS_DEFINE_IID(kIPluginInstancePeerIID, NS_IPLUGININSTANCEPEER_IID); static NS_DEFINE_IID(kIJVMPluginTagInfoIID, NS_IJVMPLUGINTAGINFO_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); @@ -74,9 +73,9 @@ nsresult nsPluginInstancePeerImpl :: QueryInterface(const nsIID& iid, void** ins if (instance == NULL) return NS_ERROR_NULL_POINTER; - if (iid.Equals(kIPluginInstancePeerIID)) + if (iid.Equals(nsIPluginInstancePeer::GetIID()) || iid.Equals(nsIPluginInstancePeer2::GetIID())) { - *instance = (void *)(nsIPluginInstancePeer *)this; + *instance = (void *)(nsIPluginInstancePeer2*)this; AddRef(); return NS_OK; } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.h b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.h index 2547a2b7872..5d28a95c25c 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.h +++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.h @@ -19,14 +19,14 @@ #ifndef nsPluginInstancePeer_h___ #define nsPluginInstancePeer_h___ -#include "nsIPluginInstancePeer.h" +#include "nsIPluginInstancePeer2.h" #include "nsIWindowlessPlugInstPeer.h" #include "nsIPluginTagInfo.h" #include "nsIPluginInstanceOwner.h" #include "nsIJVMPluginTagInfo.h" -class nsPluginInstancePeerImpl : public nsIPluginInstancePeer, +class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2, public nsIWindowlessPluginInstancePeer, public nsIPluginTagInfo2, public nsIJVMPluginTagInfo @@ -38,7 +38,7 @@ public: NS_DECL_ISUPPORTS - //nsIPluginInstancePeer interface + // nsIPluginInstancePeer interface NS_IMETHOD GetValue(nsPluginInstancePeerVariable variable, void *value); @@ -58,6 +58,8 @@ public: NS_IMETHOD SetWindowSize(PRUint32 width, PRUint32 height); + // nsIPluginInstancePeer2 interface + NS_IMETHOD GetJSWindow(JSObject* *outJSWindow);