bug 100665 - Maybe xpconnect should not init the XPCOutArg JSClass. r=jband, sr=shaver

js/src/xpconnect/src/nsXPConnect.cpp

@@ -361,9 +361,6 @@ nsXPConnect::InitClasses(JSContext * aJSContext, JSObject * aGlobalJSObj)
     if(!xpc_InitWrappedNativeJSOps())
         return UnexpectedFailure(NS_ERROR_FAILURE);
 
-    if(!nsXPCWrappedJSClass::InitClasses(ccx, aGlobalJSObj))
-        return UnexpectedFailure(NS_ERROR_FAILURE);
-
     XPCWrappedNativeScope* scope =
         XPCWrappedNativeScope::GetNewOrUsed(ccx, aGlobalJSObj);
 

js/src/xpconnect/src/xpcprivate.h

@@ -1921,7 +1921,6 @@ public:
     nsIInterfaceInfo* GetInterfaceInfo() const {return mInfo;}
     const char* GetInterfaceName();
 
-    static JSBool InitClasses(XPCCallContext& ccx, JSObject* aGlobalJSObj);
     static JSBool IsWrappedJS(nsISupports* aPtr);
 
     NS_IMETHOD DelegatedQueryInterface(nsXPCWrappedJS* self, REFNSIID aIID,

js/src/xpconnect/src/xpcwrappedjsclass.cpp

@@ -1431,22 +1431,6 @@ done:
     return retval;
 }
 
-static JSClass WrappedJSOutArg_class = {
-    "XPCOutArg", 0,
-    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
-    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
-};
-
-// static
-JSBool
-nsXPCWrappedJSClass::InitClasses(XPCCallContext& ccx, JSObject* aGlobalJSObj)
-{
-    if(!JS_InitClass(ccx, aGlobalJSObj,
-                     0, &WrappedJSOutArg_class, 0, 0, 0, 0, 0, 0))
-        return JS_FALSE;
-    return JS_TRUE;
-}
-
 const char*
 nsXPCWrappedJSClass::GetInterfaceName()
 {
@@ -1458,7 +1442,7 @@ nsXPCWrappedJSClass::GetInterfaceName()
 JSObject*
 nsXPCWrappedJSClass::NewOutObject(JSContext* cx)
 {
-    return JS_NewObject(cx, &WrappedJSOutArg_class, nsnull, nsnull);
+    return JS_NewObject(cx, nsnull, nsnull, nsnull);
 }