wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 717216 - Don't return nsnull from nsXBLDocGlobalObject::EnsureScriptEnvironment; r=volkmar

Browse Source
This commit is contained in:
Ms2ger 2012-01-15 09:13:11 +01:00
parent c08e28ffbb
commit 835800e350
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/xbl/src/nsXBLDocumentInfo.cpp
View File

@ -305,7 +305,7 @@ nsXBLDocGlobalObject::EnsureScriptEnvironment(PRUint32 aLangID)
if (mScriptContext) if (mScriptContext)
return NS_OK; // already initialized for this lang return NS_OK; // already initialized for this lang
nsCOMPtr<nsIDOMScriptObjectFactory> factory = do_GetService(kDOMScriptObjectFactoryCID); nsCOMPtr<nsIDOMScriptObjectFactory> factory = do_GetService(kDOMScriptObjectFactoryCID);
NS_ENSURE_TRUE(factory, nsnull); NS_ENSURE_TRUE(factory, NS_OK);
nsresult rv; nsresult rv;
@ -328,7 +328,7 @@ nsXBLDocGlobalObject::EnsureScriptEnvironment(PRUint32 aLangID)
rv = xpc_CreateGlobalObject(cx, &gSharedGlobalClass, principal, nsnull, rv = xpc_CreateGlobalObject(cx, &gSharedGlobalClass, principal, nsnull,
false, &mJSObject, &compartment); false, &mJSObject, &compartment);
NS_ENSURE_SUCCESS(rv, nsnull); NS_ENSURE_SUCCESS(rv, NS_OK);
::JS_SetGlobalObject(cx, mJSObject); ::JS_SetGlobalObject(cx, mJSObject);