Fixing bug 48972 -- adding an interface method GetOwner to plugin instance peer, r=peterl, sr=beard

modules/plugin/base/public/MANIFEST

@@ -54,3 +54,4 @@ nsPluginError.h
 npapi.h
 npupp.h
 nsDefaultPlugin.h
+nsPIPluginInstancePeer.h

modules/plugin/base/public/Makefile.in

@@ -56,7 +56,8 @@ EXPORTS		= \
 		nsPluginLogging.h \
 		nsPluginError.h \
 		nsDefaultPlugin.h \
-		$(NULL)
+		nsPIPluginInstancePeer.h \
+    $(NULL)
 
 # 4.x headers moved from mozilla/include
 EXPORTS		+= \

modules/plugin/base/public/nsIWindowlessPlugInstPeer.h

@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-////////////////////////////////////////////////////////////////////////////////
-/**
- * <B>INTERFACE TO NETSCAPE COMMUNICATOR PLUGINS (NEW C++ API).</B>
- *
- * <P>This superscedes the old plugin API (npapi.h, npupp.h), and 
- * eliminates the need for glue files: npunix.c, npwin.cpp and npmac.cpp that
- * get linked with the plugin. You will however need to link with the "backward
- * adapter" (badapter.cpp) in order to allow your plugin to run in pre-5.0
- * browsers. 
- *
- * <P>See nsplugin.h for an overview of how this interface fits with the 
- * overall plugin architecture.
- */
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef nsIWindowlessPluginInstancePeer_h___
-#define nsIWindowlessPluginInstancePeer_h___
-
-#include "nsplugindefs.h"
-#include "nsISupports.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// Windowless Plugin Instance Peer Interface
-
-class nsIWindowlessPluginInstancePeer : public nsISupports {
-public:
-
-    // (Corresponds to NPN_InvalidateRect.)
-    NS_IMETHOD
-    InvalidateRect(nsPluginRect *invalidRect) = 0;
-
-    // (Corresponds to NPN_InvalidateRegion.)
-    NS_IMETHOD
-    InvalidateRegion(nsPluginRegion invalidRegion) = 0;
-
-    // (Corresponds to NPN_ForceRedraw.)
-    NS_IMETHOD
-    ForceRedraw(void) = 0;
-
-};
-
-#define NS_IWINDOWLESSPLUGININSTANCEPEER_IID         \
-{ /* 57b4e2f0-019b-11d2-815b-006008119d7a */         \
-    0x57b4e2f0,                                      \
-    0x019b,                                          \
-    0x11d2,                                          \
-    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif /* nsIWindowlessPluginInstancePeer_h___ */

modules/plugin/base/public/nsPIPluginInstancePeer.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsPIPluginInstancePeer_h___
+#define nsPIPluginInstancePeer_h___
+
+#include "nsIPluginInstanceOwner.h"
+
+#define NS_PIPLUGININSTANCEPEER_IID                \
+{/* 4a708562-8a37-400b-8c08-20037d1adad3 */        \
+  0x4a708562, 0x8a37, 0x400b,                      \
+  {0x8c, 0x08, 0x20, 0x03, 0x7d, 0x1a, 0xda, 0xd3} \
+}
+
+class nsPIPluginInstancePeer : public nsISupports
+{
+public:
+	NS_DEFINE_STATIC_IID_ACCESSOR(NS_PIPLUGININSTANCEPEER_IID)
+
+ /*
+  * To get a plugin instance owner
+  */
+  NS_IMETHOD
+  GetOwner(nsCOMPtr<nsIPluginInstanceOwner> &aOwner) = 0;
+};
+
+#endif /* nsPIPluginInstancePeer_h___ */