Fixing bug 484744. Revert an IID change that broke the old Java plugin. r+sr=mrbkap@gmail.com

dom/base/nsGlobalWindow.cpp

@@ -441,11 +441,11 @@ nsDummyJavaPluginOwner::Destroy()
     nsCOMPtr<nsIPluginInstancePeer> peer;
     mInstance->GetPeer(getter_AddRefs(peer));
 
-    nsCOMPtr<nsIPluginInstancePeer2> peer2(do_QueryInterface(peer));
+    nsCOMPtr<nsIPluginInstancePeer3> peer3(do_QueryInterface(peer));
 
     // This plugin owner is going away, tell the peer.
-    if (peer2)
-      peer2->InvalidateOwner();
+    if (peer3)
+      peer3->InvalidateOwner();
 
     mInstance = nsnull;
   }

layout/generic/nsObjectFrame.cpp

@@ -2264,11 +2264,11 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner()
     nsCOMPtr<nsIPluginInstancePeer> peer;
     mInstance->GetPeer(getter_AddRefs(peer));
 
-    nsCOMPtr<nsIPluginInstancePeer2> peer2(do_QueryInterface(peer));
+    nsCOMPtr<nsIPluginInstancePeer3> peer3(do_QueryInterface(peer));
 
-    if (peer2) {
+    if (peer3) {
       // Tell the peer that its owner is going away.
-      peer2->InvalidateOwner();
+      peer3->InvalidateOwner();
     }
   }
 }

modules/plugin/base/public/nsIPluginInstancePeer2.idl

@@ -61,7 +61,7 @@ struct JSContext;
  * All functionality in nsIPluginInstancePeer can be mapped to the 4.X
  * plugin API.
  */
-[uuid(79a2d210-55e4-4687-bd87-64b10c2466cc)]
+[uuid(e7d48c00-e1f1-11d2-8360-fbc8abc4ae7c)]
 interface nsIPluginInstancePeer2 : nsIPluginInstancePeer
 {
     /**
@@ -88,7 +88,11 @@ interface nsIPluginInstancePeer2 : nsIPluginInstancePeer
      * @result           - NS_OK if this operation was successful
      */
     readonly attribute JSContextPtr JSContext;
+};
 
+[uuid(79a2d210-55e4-4687-bd87-64b10c2466cc)]
+interface nsIPluginInstancePeer3 : nsIPluginInstancePeer2
+{
     /**
      * Drop our reference to our owner.
      */

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -343,10 +343,10 @@ nsPluginInstanceTag::~nsPluginInstanceTag()
       if (owner)
         owner->SetInstance(nsnull);
 
-      nsCOMPtr<nsIPluginInstancePeer2> peer2(do_QueryInterface(peer));
+      nsCOMPtr<nsIPluginInstancePeer3> peer3(do_QueryInterface(peer));
 
-      if (peer2)
-        peer2->InvalidateOwner();
+      if (peer3)
+        peer3->InvalidateOwner();
     }
 
     NS_RELEASE(mInstance);

modules/plugin/base/src/nsPluginInstancePeer.cpp

@@ -77,9 +77,10 @@ nsPluginInstancePeerImpl::~nsPluginInstancePeerImpl()
 
 static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); 
 static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); 
-NS_IMPL_ISUPPORTS6(nsPluginInstancePeerImpl,
+NS_IMPL_ISUPPORTS7(nsPluginInstancePeerImpl,
                    nsIPluginInstancePeer,
                    nsIPluginInstancePeer2,
+                   nsIPluginInstancePeer3,
                    nsIWindowlessPluginInstancePeer,
                    nsIPluginTagInfo,
                    nsIPluginTagInfo2,

modules/plugin/base/src/nsPluginInstancePeer.h

@@ -46,7 +46,7 @@
 
 #include "nsCOMPtr.h"
 
-class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2,
+class nsPluginInstancePeerImpl : public nsIPluginInstancePeer3,
                                  public nsIWindowlessPluginInstancePeer,
                                  public nsIPluginTagInfo2,
                                  public nsPIPluginInstancePeer
@@ -60,6 +60,7 @@ public:
   NS_DECL_NSIPLUGININSTANCEPEER
   NS_DECL_NSIWINDOWLESSPLUGININSTANCEPEER
   NS_DECL_NSIPLUGININSTANCEPEER2
+  NS_DECL_NSIPLUGININSTANCEPEER3
   NS_DECL_NSIPLUGINTAGINFO
   NS_DECL_NSIPLUGINTAGINFO2