694769 - Remove nsIScriptContext::GetScriptGlobal in favour of GetGlobalJSObject

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Patch v1

Comment 1

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Patch v1.1

Missed a debug-only one.

Comment 2

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 567334 [details] [diff] [review]
Patch v1.1

>+++ b/content/xul/document/src/nsXULDocument.cpp
>@@ -3625,24 +3625,18 @@ nsXULDocument::ExecuteScript(nsIScriptCo
> {
>     NS_PRECONDITION(aScriptObject != nsnull && aContext != nsnull, "null ptr");
>     if (! aScriptObject || ! aContext)
>         return NS_ERROR_NULL_POINTER;
> 
>     NS_ENSURE_TRUE(mScriptGlobalObject, NS_ERROR_NOT_INITIALIZED);
> 
>     // Execute the precompiled script with the given version
>-    nsresult rv;
>-    void *global = mScriptGlobalObject->GetScriptGlobal(
>-                                            aContext->GetScriptTypeID());
>-    rv = aContext->ExecuteScript(aScriptObject,
>-                                 global,
>-                                 nsnull, nsnull);
>-
>-    return rv;
>+    JSObject* global = mScriptGlobalObject->GetGlobalJSObject();
>+    return aContext->ExecuteScript(aScriptObject, global, nsnull, nsnull);

Could you add an assertion which checks that aContext->GetScriptTypeID() is JS

Comment 3

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/3fb87667785f