зеркало из https://github.com/mozilla/pjs.git
Fixing smoketest blocker 109870 - crashes when favicon doesn't exist. r=dbaron ,sr=hyatt.
This commit is contained in:
Родитель
03547abceb
Коммит
7450bd55e1
|
@ -143,20 +143,24 @@ nsresult nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PRBool handledScriptError = PR_FALSE;
|
||||||
if (eventString.Equals(NS_LITERAL_STRING("onerror"))) {
|
if (eventString.Equals(NS_LITERAL_STRING("onerror"))) {
|
||||||
nsCOMPtr<nsIPrivateDOMEvent> priv(do_QueryInterface(aEvent));
|
nsCOMPtr<nsIPrivateDOMEvent> priv(do_QueryInterface(aEvent));
|
||||||
NS_ENSURE_TRUE(priv, NS_ERROR_UNEXPECTED);
|
NS_ENSURE_TRUE(priv, NS_ERROR_UNEXPECTED);
|
||||||
|
|
||||||
nsScriptErrorEvent *event;
|
nsEvent* event;
|
||||||
|
priv->GetInternalNSEvent(&event);
|
||||||
|
if (event->message == NS_SCRIPT_ERROR) {
|
||||||
|
nsScriptErrorEvent *scriptEvent = NS_STATIC_CAST(nsScriptErrorEvent*, event);
|
||||||
|
argv = ::JS_PushArguments(cx, &stackPtr, "WWi", scriptEvent->errorMsg,
|
||||||
|
scriptEvent->fileName, scriptEvent->lineNr);
|
||||||
|
NS_ENSURE_TRUE(argv, NS_ERROR_OUT_OF_MEMORY);
|
||||||
|
argc = 3;
|
||||||
|
handledScriptError = PR_TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
priv->GetInternalNSEvent((nsEvent**)&event);
|
if (!handledScriptError) {
|
||||||
|
|
||||||
argv = ::JS_PushArguments(cx, &stackPtr, "WWi", event->errorMsg,
|
|
||||||
event->fileName, event->lineNr);
|
|
||||||
NS_ENSURE_TRUE(argv, NS_ERROR_OUT_OF_MEMORY);
|
|
||||||
|
|
||||||
argc = 3;
|
|
||||||
} else {
|
|
||||||
rv = xpc->WrapNative(cx, obj, aEvent, NS_GET_IID(nsIDOMEvent),
|
rv = xpc->WrapNative(cx, obj, aEvent, NS_GET_IID(nsIDOMEvent),
|
||||||
getter_AddRefs(wrapper));
|
getter_AddRefs(wrapper));
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче