From 9889e4de2b05d1674ddf840eef43d27ef3f8ad2a Mon Sep 17 00:00:00 2001
From: "av%netscape.com" <av%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Apr 2000 21:44:56 +0000
Subject: [PATCH] #26893, moved GetDOMElement from nsIPluginTagInfo to
 nsIPluginTagInfo2.h

git-svn-id: svn://10.0.0.236/trunk@66316 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modules/plugin/base/public/nsIPluginTagInfo.h   | 13 -------------
 .../modules/plugin/base/public/nsIPluginTagInfo2.h  | 12 ++++++++++++
 .../plugin/base/src/nsPluginInstancePeer.cpp        |  4 ++--
 .../modules/plugin/nglsrc/nsPluginInstancePeer.cpp  |  4 ++--
 mozilla/modules/plugin/public/nsIPluginTagInfo.h    | 13 -------------
 mozilla/modules/plugin/public/nsIPluginTagInfo2.h   | 12 ++++++++++++
 6 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/mozilla/modules/plugin/base/public/nsIPluginTagInfo.h b/mozilla/modules/plugin/base/public/nsIPluginTagInfo.h
index b9ad32fcc0f..ac47412b9d3 100644
--- a/mozilla/modules/plugin/base/public/nsIPluginTagInfo.h
+++ b/mozilla/modules/plugin/base/public/nsIPluginTagInfo.h
@@ -81,19 +81,6 @@ 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;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h b/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
index 60cfdbba8ea..cfd25d2d9ab 100644
--- a/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
+++ b/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
@@ -118,6 +118,18 @@ public:
     NS_IMETHOD
     GetUniqueID(PRUint32 *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;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
index 56c07d232a3..3971fef2af9 100644
--- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
@@ -371,10 +371,10 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetDOMElement(nsIDOMElement* *result)
     return NS_ERROR_FAILURE;
   }
 
-  nsIPluginTagInfo  *tinfo;
+  nsIPluginTagInfo2  *tinfo;
   nsresult          rv;
 
-  rv = mOwner->QueryInterface(kIPluginTagInfoIID, (void **)&tinfo);
+  rv = mOwner->QueryInterface(kIPluginTagInfo2IID, (void **)&tinfo);
 
   if (NS_OK == rv) 
   {
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
index 56c07d232a3..3971fef2af9 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
@@ -371,10 +371,10 @@ NS_IMETHODIMP nsPluginInstancePeerImpl::GetDOMElement(nsIDOMElement* *result)
     return NS_ERROR_FAILURE;
   }
 
-  nsIPluginTagInfo  *tinfo;
+  nsIPluginTagInfo2  *tinfo;
   nsresult          rv;
 
-  rv = mOwner->QueryInterface(kIPluginTagInfoIID, (void **)&tinfo);
+  rv = mOwner->QueryInterface(kIPluginTagInfo2IID, (void **)&tinfo);
 
   if (NS_OK == rv) 
   {
diff --git a/mozilla/modules/plugin/public/nsIPluginTagInfo.h b/mozilla/modules/plugin/public/nsIPluginTagInfo.h
index b9ad32fcc0f..ac47412b9d3 100644
--- a/mozilla/modules/plugin/public/nsIPluginTagInfo.h
+++ b/mozilla/modules/plugin/public/nsIPluginTagInfo.h
@@ -81,19 +81,6 @@ 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;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/modules/plugin/public/nsIPluginTagInfo2.h b/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
index 60cfdbba8ea..cfd25d2d9ab 100644
--- a/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
+++ b/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
@@ -118,6 +118,18 @@ public:
     NS_IMETHOD
     GetUniqueID(PRUint32 *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;
 };
 
 ////////////////////////////////////////////////////////////////////////////////