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 587345 - deAgnostify nsXULPDGlobalObject some; r=jst

Browse Source
This commit is contained in:
Ms2ger 2011-03-22 14:18:17 -04:00
parent c5ad7b6a18
commit 0878988dbb
1 changed files with 75 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
content/xul/document/src/nsXULPrototypeDocument.cpp
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@ -103,8 +103,8 @@ protected:
nsXULPrototypeDocument* mGlobalObjectOwner; // weak reference
nsCOMPtr<nsIScriptContext> mScriptContexts[NS_STID_ARRAY_UBOUND];
void * mScriptGlobals[NS_STID_ARRAY_UBOUND];
nsCOMPtr<nsIScriptContext> mContext;
JSObject* mJSObject;
nsCOMPtr<nsIPrincipal> mCachedPrincipal;
@ -632,7 +632,6 @@ nsXULPrototypeDocument::GetScriptGlobalObject()
nsXULPDGlobalObject::nsXULPDGlobalObject(nsXULPrototypeDocument* owner)
: mGlobalObjectOwner(owner)
{
memset(mScriptGlobals, 0, sizeof(mScriptGlobals));
}
@ -643,12 +642,7 @@ nsXULPDGlobalObject::~nsXULPDGlobalObject()
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULPDGlobalObject)
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsXULPDGlobalObject)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULPDGlobalObject)
{
PRUint32 lang_index;
NS_STID_FOR_INDEX(lang_index) {
cb.NoteXPCOMChild(tmp->mScriptContexts[lang_index]);
}
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mContext)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXULPDGlobalObject)
@ -670,29 +664,21 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(nsXULPDGlobalObject,
nsresult
nsXULPDGlobalObject::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScriptContext)
{
NS_ABORT_IF_FALSE(lang_id == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
// almost a clone of nsGlobalWindow
nsresult rv;
PRBool ok = NS_STID_VALID(lang_id);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, NS_ERROR_INVALID_ARG);
PRUint32 lang_ndx = NS_STID_INDEX(lang_id);
if (!aScriptContext)
if (!aScriptContext) {
NS_WARNING("Possibly early removal of script object, see bug #41608");
else {
} else {
// should probably assert the context is clean???
aScriptContext->WillInitializeContext();
// NOTE: We init this context with a NULL global - this is subtly
// different than nsGlobalWindow which passes 'this'
rv = aScriptContext->InitContext();
nsresult rv = aScriptContext->InitContext();
NS_ENSURE_SUCCESS(rv, rv);
}
NS_ASSERTION(!aScriptContext || !mScriptContexts[lang_ndx],
"Bad call to SetContext()!");
NS_ASSERTION(!aScriptContext || !mContext, "Bad call to SetContext()!");
void *script_glob = nsnull;
void* script_glob = NULL;
if (aScriptContext) {
aScriptContext->SetGCOnDestruction(PR_FALSE);
@ -700,120 +686,111 @@ nsXULPDGlobalObject::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScrip
script_glob = aScriptContext->GetNativeGlobal();
NS_ASSERTION(script_glob, "GetNativeGlobal returned NULL!");
}
mScriptContexts[lang_ndx] = aScriptContext;
mScriptGlobals[lang_ndx] = script_glob;
mContext = aScriptContext;
mJSObject = static_cast<JSObject*>(script_glob);
return NS_OK;
}
nsresult
nsXULPDGlobalObject::EnsureScriptEnvironment(PRUint32 lang_id)
{
PRBool ok = NS_STID_VALID(lang_id);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, NS_ERROR_INVALID_ARG);
PRUint32 lang_ndx = NS_STID_INDEX(lang_id);
if (mScriptContexts[lang_ndx] == nsnull) {
nsresult rv;
NS_ASSERTION(mScriptGlobals[lang_ndx] == nsnull, "Have global without context?");
nsCOMPtr<nsIScriptRuntime> languageRuntime;
rv = NS_GetScriptRuntimeByID(lang_id, getter_AddRefs(languageRuntime));
NS_ENSURE_SUCCESS(rv, nsnull);
nsCOMPtr<nsIScriptContext> ctxNew;
rv = languageRuntime->CreateContext(getter_AddRefs(ctxNew));
// For JS, we have to setup a special global object. We do this then
// attach it as the global for this context. Then, ::SetScriptContext
// will re-fetch the global and set it up in our language globals array.
if (lang_id == nsIProgrammingLanguage::JAVASCRIPT) {
// some special JS specific code we should abstract
JSContext *cx = (JSContext *)ctxNew->GetNativeContext();
JSAutoRequest ar(cx);
nsIPrincipal *principal = GetPrincipal();
JSObject *newGlob;
JSCompartment *compartment;
rv = xpc_CreateGlobalObject(cx, &gSharedGlobalClass, principal, nsnull,
false, &newGlob, &compartment);
NS_ENSURE_SUCCESS(rv, nsnull);
::JS_SetGlobalObject(cx, newGlob);
// Add an owning reference from JS back to us. This'll be
// released when the JSObject is finalized.
::JS_SetPrivate(cx, newGlob, this);
NS_ADDREF(this);
}
NS_ENSURE_SUCCESS(rv, nsnull);
rv = SetScriptContext(lang_id, ctxNew);
NS_ENSURE_SUCCESS(rv, nsnull);
NS_ABORT_IF_FALSE(lang_id == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
if (mContext) {
return NS_OK;
}
NS_ASSERTION(!mJSObject, "Have global without context?");
nsCOMPtr<nsIScriptRuntime> languageRuntime;
nsresult rv = NS_GetScriptRuntimeByID(nsIProgrammingLanguage::JAVASCRIPT,
getter_AddRefs(languageRuntime));
NS_ENSURE_SUCCESS(rv, NS_OK);
nsCOMPtr<nsIScriptContext> ctxNew;
rv = languageRuntime->CreateContext(getter_AddRefs(ctxNew));
// We have to setup a special global object. We do this then
// attach it as the global for this context. Then, ::SetScriptContext
// will re-fetch the global and set it up in our language globals array.
{
JSContext *cx = (JSContext *)ctxNew->GetNativeContext();
JSAutoRequest ar(cx);
nsIPrincipal *principal = GetPrincipal();
JSObject *newGlob;
JSCompartment *compartment;
rv = xpc_CreateGlobalObject(cx, &gSharedGlobalClass, principal, nsnull,
false, &newGlob, &compartment);
NS_ENSURE_SUCCESS(rv, NS_OK);
::JS_SetGlobalObject(cx, newGlob);
// Add an owning reference from JS back to us. This'll be
// released when the JSObject is finalized.
::JS_SetPrivate(cx, newGlob, this);
NS_ADDREF(this);
}
NS_ENSURE_SUCCESS(rv, NS_OK);
rv = SetScriptContext(lang_id, ctxNew);
NS_ENSURE_SUCCESS(rv, NS_OK);
return NS_OK;
}
nsIScriptContext *
nsIScriptContext*
nsXULPDGlobalObject::GetScriptContext(PRUint32 lang_id)
{
NS_ABORT_IF_FALSE(lang_id == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
// This global object creates a context on demand - do that now.
nsresult rv = EnsureScriptEnvironment(lang_id);
nsresult rv = EnsureScriptEnvironment(nsIProgrammingLanguage::JAVASCRIPT);
if (NS_FAILED(rv)) {
NS_ERROR("Failed to setup script language");
return nsnull;
return NULL;
}
// Note that EnsureScriptEnvironment has validated lang_id
return mScriptContexts[NS_STID_INDEX(lang_id)];
return mContext;
}
void *
void*
nsXULPDGlobalObject::GetScriptGlobal(PRUint32 lang_id)
{
PRBool ok = NS_STID_VALID(lang_id);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, nsnull);
PRUint32 lang_ndx = NS_STID_INDEX(lang_id);
NS_ASSERTION(mScriptContexts[lang_ndx] != nsnull, "Querying for global before setting up context?");
return mScriptGlobals[lang_ndx];
NS_ABORT_IF_FALSE(lang_id == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
return mJSObject;
}
void
nsXULPDGlobalObject::ClearGlobalObjectOwner()
{
NS_ASSERTION(!mCachedPrincipal, "This shouldn't ever be set until now!");
NS_ASSERTION(!mCachedPrincipal, "This shouldn't ever be set until now!");
// Cache mGlobalObjectOwner's principal if possible.
if (this != nsXULPrototypeDocument::gSystemGlobal)
mCachedPrincipal = mGlobalObjectOwner->DocumentPrincipal();
// Cache mGlobalObjectOwner's principal if possible.
if (this != nsXULPrototypeDocument::gSystemGlobal)
mCachedPrincipal = mGlobalObjectOwner->DocumentPrincipal();
PRUint32 lang_ndx;
NS_STID_FOR_INDEX(lang_ndx) {
if (mScriptContexts[lang_ndx]) {
mScriptContexts[lang_ndx]->FinalizeContext();
mScriptContexts[lang_ndx] = nsnull;
}
}
if (mContext) {
mContext->FinalizeContext();
mContext = NULL;
}
mGlobalObjectOwner = nsnull;
mGlobalObjectOwner = NULL;
}
void
nsXULPDGlobalObject::OnFinalize(PRUint32 aLangID, void *aObject)
{
NS_ASSERTION(NS_STID_VALID(aLangID), "Invalid language ID");
NS_ASSERTION(aObject == mScriptGlobals[NS_STID_INDEX(aLangID)],
"Wrong object finalized!");
mScriptGlobals[NS_STID_INDEX(aLangID)] = nsnull;
NS_ABORT_IF_FALSE(aLangId == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
mJSObject = NULL;
}
void
nsXULPDGlobalObject::SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts)
{
// We don't care...
// We don't care...
}
//----------------------------------------------------------------------