Fix for bug 499787 (Remove one AddRef/Release pair from GatherProtoScriptableCreateInfo). r/sr=mrbkap.

--HG--
extra : rebase_source : 2db51a8d57cf6bdb8c42e677a819e1d3687e3593

js/src/xpconnect/src/xpcprivate.h

@@ -1811,6 +1811,8 @@ public:
 
     void
     SetCallback(nsIXPCScriptable* s) {mCallback = s;}
+    void
+    SetCallback(already_AddRefed<nsIXPCScriptable> s) {mCallback = s;}
 
     void
     SetScriptableShared(XPCNativeScriptableShared* shared) {mShared = shared;}
@@ -1859,6 +1861,9 @@ public:
 
     void
     SetCallback(nsIXPCScriptable* callback) {mCallback = callback;}
+    void
+    SetCallback(already_AddRefed<nsIXPCScriptable> callback)
+      {mCallback = callback;}
 
     void
     SetFlags(const XPCNativeScriptableFlags& flags)  {mFlags = flags;}

js/src/xpconnect/src/xpcwrappednative.cpp

@@ -807,7 +807,7 @@ XPCWrappedNative::GatherProtoScriptableCreateInfo(
             if(NS_FAILED(rv))
                 flags = 0;
 
-            sciProto->SetCallback(helper);
+            sciProto->SetCallback(helper.forget());
             sciProto->SetFlags(flags);
         }
     }
@@ -846,7 +846,7 @@ XPCWrappedNative::GatherScriptableCreateInfo(
         if(NS_FAILED(rv))
             flags = 0;
 
-        sciWrapper->SetCallback(helper);
+        sciWrapper->SetCallback(helper.forget());
         sciWrapper->SetFlags(flags);
 
         // A whole series of assertions to catch bad uses of scriptable flags on