Make sure to call ScriptEvaluated after running XBL constructors/destructors.

Bug 295124, r+sr=jst, a=asa.
This commit is contained in:
bzbarsky%mit.edu 2005-06-09 15:39:07 +00:00
Родитель 22027022a4
Коммит 379cc266ed
1 изменённых файлов: 2 добавлений и 9 удалений

Просмотреть файл

@ -315,14 +315,8 @@ nsXBLProtoImplAnonymousMethod::Execute(nsIContent* aBoundElement)
// Now call the method
nsCOMPtr<nsIJSContextStack> cxstack =
do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
if (NS_FAILED(rv))
return rv;
rv = cxstack->Push(cx);
if (NS_FAILED(rv))
return rv;
// Use nsCxPusher to make sure we call ScriptEvaluated when we're done.
nsCxPusher pusher(aBoundElement);
// Check whether it's OK to call the method.
rv = nsContentUtils::GetSecurityManager()->CheckFunctionAccess(cx, method, thisObject);
@ -333,7 +327,6 @@ nsXBLProtoImplAnonymousMethod::Execute(nsIContent* aBoundElement)
ok = ::JS_CallFunctionValue(cx, thisObject, OBJECT_TO_JSVAL(method),
0 /* argc */, nsnull /* argv */, &retval);
}
cxstack->Pop(&cx);
if (!ok) {
return NS_ERROR_FAILURE;