Bug 22598. r=vidur

layout/generic/nsObjectFrame.cpp

@@ -51,6 +51,7 @@
 #include "nsITimerCallback.h"
 #include "nsLayoutAtoms.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsIDOMElement.h"
 
 // XXX For temporary paint code
 #include "nsIStyleContext.h"
@@ -97,6 +98,8 @@ public:
 
   NS_IMETHOD GetAttribute(const char* name, const char* *result);
 
+  NS_IMETHOD GetDOMElement(nsIDOMElement* *result);
+
   //nsIPluginTagInfo2 interface
 
   NS_IMETHOD GetTagType(nsPluginTagType *result);
@@ -1662,6 +1665,28 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttribute(const char* name, const char*
   return NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP nsPluginInstanceOwner::GetDOMElement(nsIDOMElement* *result)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+
+  *result = nsnull;
+
+  if (nsnull != mOwner)
+  {
+    nsIContent  *cont;
+
+    mOwner->GetContent(&cont);
+
+    if (nsnull != cont)
+    {
+      rv = cont->QueryInterface(nsIDOMElement::GetIID(), (void **)result);
+      NS_RELEASE(cont);
+    }
+  }
+
+  return rv;
+}
+
 NS_IMETHODIMP nsPluginInstanceOwner::GetInstance(nsIPluginInstance *&aInstance)
 {
   if (nsnull != mInstance)

layout/html/base/src/nsObjectFrame.cpp

@@ -51,6 +51,7 @@
 #include "nsITimerCallback.h"
 #include "nsLayoutAtoms.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsIDOMElement.h"
 
 // XXX For temporary paint code
 #include "nsIStyleContext.h"
@@ -97,6 +98,8 @@ public:
 
   NS_IMETHOD GetAttribute(const char* name, const char* *result);
 
+  NS_IMETHOD GetDOMElement(nsIDOMElement* *result);
+
   //nsIPluginTagInfo2 interface
 
   NS_IMETHOD GetTagType(nsPluginTagType *result);
@@ -1662,6 +1665,28 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetAttribute(const char* name, const char*
   return NS_ERROR_FAILURE;
 }
 
+NS_IMETHODIMP nsPluginInstanceOwner::GetDOMElement(nsIDOMElement* *result)
+{
+  nsresult rv = NS_ERROR_FAILURE;
+
+  *result = nsnull;
+
+  if (nsnull != mOwner)
+  {
+    nsIContent  *cont;
+
+    mOwner->GetContent(&cont);
+
+    if (nsnull != cont)
+    {
+      rv = cont->QueryInterface(nsIDOMElement::GetIID(), (void **)result);
+      NS_RELEASE(cont);
+    }
+  }
+
+  return rv;
+}
+
 NS_IMETHODIMP nsPluginInstanceOwner::GetInstance(nsIPluginInstance *&aInstance)
 {
   if (nsnull != mInstance)

modules/plugin/base/public/nsIPluginTagInfo.h

@@ -41,6 +41,8 @@
 #include "nsplugindefs.h"
 #include "nsISupports.h"
 
+class nsIDOMElement;
+
 #define NS_IPLUGINTAGINFO_IID                        \
 { /* 5f1ec1d0-019b-11d2-815b-006008119d7a */         \
     0x5f1ec1d0,                                      \
@@ -80,6 +82,18 @@ public:
     NS_IMETHOD
     GetAttribute(const char* name, const char* *result) = 0;
 
+    /**
+     * Returns the DOM element corresponding to the tag which references
+     * this plugin in the document.
+     *
+     * REMIND: do we need to expose as an nsISupports * to avoid
+     * introducing runtime dependencies on XPCOM?
+     *
+     * @param result - resulting DOM element
+     * @result - NS_OK if this operation was successful
+     */
+    NS_IMETHOD
+    GetDOMElement(nsIDOMElement* *result) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////

modules/plugin/base/src/nsPluginInstancePeer.cpp

@@ -358,6 +358,28 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetAttribute(const char* name, const cha
   }
 }
 
+NS_IMETHODIMP nsPluginInstancePeerImpl::GetDOMElement(nsIDOMElement* *result)
+{
+  if (mOwner == nsnull)
+  {
+    *result = nsnull;
+    return NS_ERROR_FAILURE;
+  }
+
+  nsIPluginTagInfo  *tinfo;
+  nsresult          rv;
+
+  rv = mOwner->QueryInterface(kIPluginTagInfoIID, (void **)&tinfo);
+
+  if (NS_OK == rv) 
+  {
+    rv = tinfo->GetDOMElement(result);
+    NS_RELEASE(tinfo);
+  }
+
+  return rv;
+}
+
 NS_IMETHODIMP nsPluginInstancePeerImpl::GetTagType(nsPluginTagType *result)
 {
   if (nsnull != mOwner)

modules/plugin/base/src/nsPluginInstancePeer.h

@@ -98,6 +98,9 @@ public:
   NS_IMETHOD
   GetAttribute(const char* name, const char* *result);
 
+  NS_IMETHOD
+  GetDOMElement(nsIDOMElement* *result);
+
   //nsIPluginTagInfo2 interface
 
   NS_IMETHOD

modules/plugin/nglsrc/nsPluginInstancePeer.cpp

@@ -358,6 +358,28 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetAttribute(const char* name, const cha
   }
 }
 
+NS_IMETHODIMP nsPluginInstancePeerImpl::GetDOMElement(nsIDOMElement* *result)
+{
+  if (mOwner == nsnull)
+  {
+    *result = nsnull;
+    return NS_ERROR_FAILURE;
+  }
+
+  nsIPluginTagInfo  *tinfo;
+  nsresult          rv;
+
+  rv = mOwner->QueryInterface(kIPluginTagInfoIID, (void **)&tinfo);
+
+  if (NS_OK == rv) 
+  {
+    rv = tinfo->GetDOMElement(result);
+    NS_RELEASE(tinfo);
+  }
+
+  return rv;
+}
+
 NS_IMETHODIMP nsPluginInstancePeerImpl::GetTagType(nsPluginTagType *result)
 {
   if (nsnull != mOwner)

modules/plugin/nglsrc/nsPluginInstancePeer.h

@@ -1,178 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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 Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsPluginInstancePeer_h___
-#define nsPluginInstancePeer_h___
-
-#include "nsIPluginInstancePeer2.h"
-#include "nsIWindowlessPlugInstPeer.h"
-#include "nsIPluginTagInfo.h"
-#include "nsIPluginInstanceOwner.h"
-#include "nsIJVMPluginTagInfo.h"
-
-
-class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2,
-								 public nsIWindowlessPluginInstancePeer,
-                                 public nsIPluginTagInfo2,
-                                 public nsIJVMPluginTagInfo
-								
-{
-public:
-  nsPluginInstancePeerImpl();
-  virtual ~nsPluginInstancePeerImpl();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIPluginInstancePeer interface
-
-  NS_IMETHOD
-  GetValue(nsPluginInstancePeerVariable variable, void *value);
-
-  NS_IMETHOD
-  GetMIMEType(nsMIMEType *result);
-
-  NS_IMETHOD
-  GetMode(nsPluginMode *result);
-
-  NS_IMETHOD
-  NewStream(nsMIMEType type, const char* target, nsIOutputStream* *result);
-
-  NS_IMETHOD
-  ShowStatus(const char* message);
-
-  NS_IMETHOD
-  SetWindowSize(PRUint32 width, PRUint32 height);
-
-  // nsIPluginInstancePeer2 interface
-
-  NS_IMETHOD
-  GetJSWindow(JSObject* *outJSWindow);
-  
-  NS_IMETHOD
-  GetJSThread(PRUint32 *outThreadID);
-
-  NS_IMETHOD
-  GetJSContext(JSContext* *outContext);
-
-  // nsIWindowlessPluginInstancePeer
-
-  // (Corresponds to NPN_InvalidateRect.)
-  NS_IMETHOD
-  InvalidateRect(nsPluginRect *invalidRect);
-
-  // (Corresponds to NPN_InvalidateRegion.)
-  NS_IMETHOD
-  InvalidateRegion(nsPluginRegion invalidRegion);
-
-  // (Corresponds to NPN_ForceRedraw.)
-  NS_IMETHOD
-  ForceRedraw(void);
-
-  /* The tag info interfaces all pass through calls to the 
-     nsPluginInstanceOwner (see nsObjectFrame.cpp) */
-
-  //nsIPluginTagInfo interface
-
-  NS_IMETHOD
-  GetAttributes(PRUint16& n, const char*const*& names, const char*const*& values);
-
-  NS_IMETHOD
-  GetAttribute(const char* name, const char* *result);
-
-  //nsIPluginTagInfo2 interface
-
-  NS_IMETHOD
-  GetTagType(nsPluginTagType *result);
-
-  NS_IMETHOD
-  GetTagText(const char* *result);
-
-  NS_IMETHOD
-  GetParameters(PRUint16& n, const char*const*& names, const char*const*& values);
-
-  NS_IMETHOD
-  GetParameter(const char* name, const char* *result);
-  
-  NS_IMETHOD
-  GetDocumentBase(const char* *result);
-  
-  NS_IMETHOD
-  GetDocumentEncoding(const char* *result);
-  
-  NS_IMETHOD
-  GetAlignment(const char* *result);
-  
-  NS_IMETHOD
-  GetWidth(PRUint32 *result);
-  
-  NS_IMETHOD
-  GetHeight(PRUint32 *result);
-  
-  NS_IMETHOD
-  GetBorderVertSpace(PRUint32 *result);
-  
-  NS_IMETHOD
-  GetBorderHorizSpace(PRUint32 *result);
-
-  NS_IMETHOD
-  GetUniqueID(PRUint32 *result);
-
-  //nsIJVMPluginTagInfo interface
-
-  NS_IMETHOD
-  GetCode(const char* *result);
-
-  NS_IMETHOD
-  GetCodeBase(const char* *result);
-
-  NS_IMETHOD
-  GetArchive(const char* *result);
-
-  NS_IMETHOD
-  GetName(const char* *result);
-
-  NS_IMETHOD
-  GetMayScript(PRBool *result);
-
-  //locals
-
-  nsresult Initialize(nsIPluginInstanceOwner *aOwner,
-                      const nsMIMEType aMimeType);
-
-  nsresult SetOwner(nsIPluginInstanceOwner *aOwner);
-
-  nsresult GetOwner(nsIPluginInstanceOwner *&aOwner);
-
-/*  void SetStopped();
-  void SetStarted();
-
-  void IsStopped(PRBool *result);*/
-
-private:
-  nsIPluginInstance       *mInstance; //we don't add a ref to this
-  nsIPluginInstanceOwner  *mOwner;    //we don't add a ref to this
-  nsMIMEType              mMIMEType;
-  PRUint32                mThreadID;
-  PRBool                  mStopped;
-};
-
-#endif

modules/plugin/public/nsIPluginTagInfo.h

@@ -41,6 +41,8 @@
 #include "nsplugindefs.h"
 #include "nsISupports.h"
 
+class nsIDOMElement;
+
 #define NS_IPLUGINTAGINFO_IID                        \
 { /* 5f1ec1d0-019b-11d2-815b-006008119d7a */         \
     0x5f1ec1d0,                                      \
@@ -80,6 +82,18 @@ public:
     NS_IMETHOD
     GetAttribute(const char* name, const char* *result) = 0;
 
+    /**
+     * Returns the DOM element corresponding to the tag which references
+     * this plugin in the document.
+     *
+     * REMIND: do we need to expose as an nsISupports * to avoid
+     * introducing runtime dependencies on XPCOM?
+     *
+     * @param result - resulting DOM element
+     * @result - NS_OK if this operation was successful
+     */
+    NS_IMETHOD
+    GetDOMElement(nsIDOMElement* *result) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////