Fixing regression bug 364474. Make wrapping of plugin DOM node work even if the underlying plugin wrapping fails. r=josh@mozilla.com, sr=bugmail@sicking.cc

This commit is contained in:
jst%mozilla.org 2007-01-19 00:08:06 +00:00
Родитель 3316f787fe
Коммит 1144f21d61
1 изменённых файлов: 6 добавлений и 1 удалений

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

@ -9068,7 +9068,12 @@ nsHTMLPluginObjElementSH::GetPluginJSObject(JSContext *cx, JSObject *obj,
nsresult rv = sXPConnect->WrapNative(cx, ::JS_GetParent(cx, obj),
scriptable_peer,
scriptableIID, getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
// Wrapping a plugin object can fail if the plugins XPT file can't
// be found (i.e. is incorrectly installed). Return NS_OK in such a
// case to avoid having this generate exceptions in JS and to let
// the script still access the DOM node, even if the underlying
// plugin won't be scriptable.
NS_ENSURE_SUCCESS(rv, NS_OK);
// QI holder to nsIXPConnectWrappedNative so that we can reliably
// access it's prototype