From 8e2a74ee6ce790800b5aa3ff18f48ae022f8f137 Mon Sep 17 00:00:00 2001
From: "peterlubczynski%netscape.com"
 <peterlubczynski%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 24 Sep 2001 04:35:02 +0000
Subject: [PATCH] Incorrect GetAttributes/GetParameters for embed/object tag
 types patch by philanderton@yahoo.com bug 99063 r=peterl sr=attinasi

git-svn-id: svn://10.0.0.236/trunk@103608 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modules/plugin/base/src/ns4xPluginInstance.cpp   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index c87b41d8c5e..e19b6ac1ded 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -769,11 +769,17 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
 
   mPeer = peer;
 
-  nsCOMPtr<nsIPluginTagInfo> taginfo = do_QueryInterface(mPeer, &rv);
+  nsCOMPtr<nsIPluginTagInfo2> taginfo = do_QueryInterface(mPeer, &rv);
 
   if (NS_SUCCEEDED(rv))
-    taginfo->GetAttributes(count, names, values);
-
+  {
+    nsPluginTagType tagtype;
+    taginfo->GetTagType(&tagtype);
+    if (tagtype == nsPluginTagType_Embed)
+      taginfo->GetAttributes(count, names, values);
+    else  // nsPluginTagType_Object
+      taginfo->GetParameters(count, names, values);
+  }
   if (fCallbacks->newp == nsnull)
     return NS_ERROR_FAILURE; // XXX right error?