From 52172fe2c61df3e0372dd7686bab0539f3b234f0 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Thu, 22 Aug 2002 01:26:17 +0000 Subject: [PATCH] Fixing bug 48972 -- adding an interface method GetOwner to plugin instance peer, r=peterl, sr=beard git-svn-id: svn://10.0.0.236/trunk@127824 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/public/MANIFEST | 1 + .../modules/plugin/base/public/Makefile.in | 3 +- .../base/public/nsIWindowlessPlugInstPeer.h | 18 +++--- .../base/public/nsPIPluginInstancePeer.h | 61 +++++++++++++++++++ 4 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 mozilla/modules/plugin/base/public/nsPIPluginInstancePeer.h diff --git a/mozilla/modules/plugin/base/public/MANIFEST b/mozilla/modules/plugin/base/public/MANIFEST index 13000c07ec9..906bfdd1b93 100644 --- a/mozilla/modules/plugin/base/public/MANIFEST +++ b/mozilla/modules/plugin/base/public/MANIFEST @@ -54,3 +54,4 @@ nsPluginError.h npapi.h npupp.h nsDefaultPlugin.h +nsPIPluginInstancePeer.h diff --git a/mozilla/modules/plugin/base/public/Makefile.in b/mozilla/modules/plugin/base/public/Makefile.in index 74461eebe4d..47ab88f9ba9 100644 --- a/mozilla/modules/plugin/base/public/Makefile.in +++ b/mozilla/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 += \ diff --git a/mozilla/modules/plugin/base/public/nsIWindowlessPlugInstPeer.h b/mozilla/modules/plugin/base/public/nsIWindowlessPlugInstPeer.h index dd2c64c0f83..de295f42fdb 100644 --- a/mozilla/modules/plugin/base/public/nsIWindowlessPlugInstPeer.h +++ b/mozilla/modules/plugin/base/public/nsIWindowlessPlugInstPeer.h @@ -59,8 +59,17 @@ //////////////////////////////////////////////////////////////////////////////// // Windowless Plugin Instance Peer Interface +#define NS_IWINDOWLESSPLUGININSTANCEPEER_IID \ +{ /* 57b4e2f0-019b-11d2-815b-006008119d7a */ \ + 0x57b4e2f0, \ + 0x019b, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + class nsIWindowlessPluginInstancePeer : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWINDOWLESSPLUGININSTANCEPEER_IID) // (Corresponds to NPN_InvalidateRect.) NS_IMETHOD @@ -73,17 +82,8 @@ public: // (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___ */ diff --git a/mozilla/modules/plugin/base/public/nsPIPluginInstancePeer.h b/mozilla/modules/plugin/base/public/nsPIPluginInstancePeer.h new file mode 100644 index 00000000000..d14e3687aa6 --- /dev/null +++ b/mozilla/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 &aOwner) = 0; +}; + +#endif /* nsPIPluginInstancePeer_h___ */