Fixing bug 380474. Use the inner object when looking up methods and adding event listeners. r=mrbkap@mozilla.org, sr=brendan@mozilla.org

dom/src/base/nsDOMClassInfo.cpp

@@ -6620,6 +6620,8 @@ nsEventReceiverSH::AddEventListenerHelper(JSContext *cx, JSObject *obj,
     return JS_FALSE;
   }
 
+  OBJ_TO_INNER_OBJECT(cx, obj);
+
   nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
   nsresult rv =
     sXPConnect->GetWrappedNativeOfJSObject(cx, obj, getter_AddRefs(wrapper));

js/src/xpconnect/src/xpccomponents.cpp

@@ -2786,6 +2786,8 @@ nsXPCComponents_Utils::LookupMethod()
 
     JSObject* obj = JSVAL_TO_OBJECT(argv[0]);
 
+    OBJ_TO_INNER_OBJECT(cx, obj);
+
     // second param must be a string
     if(!JSVAL_IS_STRING(argv[1]))
         return NS_ERROR_XPC_BAD_CONVERT_JS;