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 575431 - Re-marry nsGlobalWindow to JS (instead of being language-agnostic). r=jst

Browse Source
This commit is contained in:
Blake Kaplan 2010-06-29 11:46:39 -07:00
parent 129690a412
commit 6442fff51c
2 changed files with 101 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

370
dom/base/nsGlobalWindow.cpp
View File

@ -688,7 +688,6 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
, mCallCleanUpAfterModalDialogCloses(PR_FALSE)
, mWindowID(gNextWindowID++)
{
memset(mScriptGlobals, 0, sizeof(mScriptGlobals));
nsLayoutStatics::AddRef();
// Initialize the PRCList (this).
@ -966,10 +965,7 @@ nsGlobalWindow::CleanUp(PRBool aIgnoreModalDialog)
this)->mMessageManager.get())->Disconnect();
}
PRUint32 scriptIndex;
NS_STID_FOR_INDEX(scriptIndex) {
mInnerWindowHolders[scriptIndex] = nsnull;
}
mInnerWindowHolder = nsnull;
mArguments = nsnull;
mArgumentsLast = nsnull;
mArgumentsOrigin = nsnull;
@ -1041,15 +1037,7 @@ nsGlobalWindow::ReallyClearScope(nsRunnable *aRunnable)
}
NotifyWindowIDDestroyed("inner-window-destroyed");
PRUint32 lang_id;
NS_STID_FOR_ID(lang_id) {
// Note that scx comes from the outer window. If this is an inner
// window, it may not be the current inner for its outer.
nsIScriptContext *scx = GetScriptContextInternal(lang_id);
if (scx)
scx->ClearScope(mScriptGlobals[NS_STID_INDEX(lang_id)], PR_TRUE);
}
GetContextInternal()->ClearScope(mJSObject, PR_TRUE);
}
void
@ -1192,13 +1180,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mArguments)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mArgumentsLast)
for (PRUint32 i = 0; i < NS_STID_ARRAY_UBOUND; ++i) {
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mScriptContexts[i])
}
for (PRUint32 i = 0; i < NS_STID_ARRAY_UBOUND; ++i) {
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mInnerWindowHolders[i])
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mInnerWindowHolder)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOpenerScriptPrincipal)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mListenerManager)
@ -1234,13 +1216,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mArguments)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mArgumentsLast)
for (PRUint32 i = 0; i < NS_STID_ARRAY_UBOUND; ++i) {
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mScriptContexts[i])
}
for (PRUint32 i = 0; i < NS_STID_ARRAY_UBOUND; ++i) {
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mInnerWindowHolders[i])
}
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mInnerWindowHolder)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOpenerScriptPrincipal)
NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mListenerManager)
@ -1299,27 +1275,22 @@ NS_IMPL_CYCLE_COLLECTION_ROOT_END
nsresult
nsGlobalWindow::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScriptContext)
{
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);
NS_ASSERTION(lang_id == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
NS_ASSERTION(IsOuterWindow(), "Uh, SetScriptContext() called on inner window!");
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();
// Bind the script context and the global object
rv = aScriptContext->InitContext(this);
nsresult rv = aScriptContext->InitContext(this);
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;
@ -1336,102 +1307,49 @@ nsGlobalWindow::SetScriptContext(PRUint32 lang_id, nsIScriptContext *aScriptCont
script_glob = aScriptContext->GetNativeGlobal();
NS_ASSERTION(script_glob, "GetNativeGlobal returned NULL!");
}
// for now, keep mContext real.
if (lang_id == nsIProgrammingLanguage::JAVASCRIPT) {
mContext = aScriptContext;
mJSObject = (JSObject *)script_glob;
}
mScriptContexts[lang_ndx] = aScriptContext;
mScriptGlobals[lang_ndx] = script_glob;
mContext = aScriptContext;
mJSObject = (JSObject *)script_glob;
return NS_OK;
}
nsresult
nsGlobalWindow::EnsureScriptEnvironment(PRUint32 aLangID)
{
NS_ASSERTION(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
FORWARD_TO_OUTER(EnsureScriptEnvironment, (aLangID), NS_ERROR_NOT_INITIALIZED);
nsresult rv;
PRBool ok = NS_STID_VALID(aLangID);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, NS_ERROR_INVALID_ARG);
PRUint32 lang_ndx = NS_STID_INDEX(aLangID);
if (mScriptGlobals[lang_ndx])
return NS_OK; // already initialized for this language.
if (mJSObject)
return NS_OK;
nsCOMPtr<nsIScriptRuntime> scriptRuntime;
rv = NS_GetScriptRuntimeByID(aLangID, getter_AddRefs(scriptRuntime));
nsresult rv = NS_GetScriptRuntimeByID(aLangID, getter_AddRefs(scriptRuntime));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIScriptContext> context;
rv = scriptRuntime->CreateContext(getter_AddRefs(context));
NS_ENSURE_SUCCESS(rv, rv);
rv = SetScriptContext(aLangID, context);
NS_ENSURE_SUCCESS(rv, rv);
// Note that SetScriptContext has taken a reference to the context.
// If we have arguments, tell the new language about it.
nsGlobalWindow *currentInner = GetCurrentInnerWindowInternal();
if (currentInner) {
// We are being initialized after the document has been setup.
// Do what would have been done in SetNewDocument had we been around then.
NS_ASSERTION(!mInnerWindowHolders[lang_ndx], "already have a holder?");
nsCOMPtr<nsISupports> &holder = mInnerWindowHolders[lang_ndx];
PRBool isChrome = PR_FALSE; // xxxmarkh - what about this??
void *&innerGlob = currentInner->mScriptGlobals[lang_ndx];
rv = context->CreateNativeGlobalForInner(this, isChrome,
&innerGlob,
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(innerGlob && holder, "Failed to get global and holder");
rv = context->ConnectToInner(currentInner, mScriptGlobals[lang_ndx]);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMDocument> doc(do_QueryInterface(mDocument));
if (doc)
context->DidSetDocument(doc, innerGlob);
if (mArgumentsLast != nsnull) {
context->SetProperty(innerGlob, "arguments", mArgumentsLast);
}
}
return NS_OK;
return SetScriptContext(aLangID, context);
}
nsIScriptContext *
nsGlobalWindow::GetScriptContext(PRUint32 lang)
{
NS_ASSERTION(lang == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
FORWARD_TO_OUTER(GetScriptContext, (lang), nsnull);
PRBool ok = NS_STID_VALID(lang);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, nsnull);
PRUint32 lang_ndx = NS_STID_INDEX(lang);
// for now we are still storing the JS versions in members. Check the
// JS elements of our array are still in sync. Do this each time we are
// called, as much JS specific code still goes via GetContext
NS_ASSERTION(mScriptContexts[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)] == mContext &&
mScriptGlobals[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)] == mJSObject,
"JS language contexts are confused");
return mScriptContexts[lang_ndx];
return mContext;
}
void *
nsGlobalWindow::GetScriptGlobal(PRUint32 lang)
{
PRBool ok = NS_STID_VALID(lang);
NS_ASSERTION(ok, "Invalid programming language ID requested");
NS_ENSURE_TRUE(ok, nsnull);
PRUint32 lang_ndx = NS_STID_INDEX(lang);
// for now we are still storing the JS versions in members. Check the
// JS elements of our array are still in sync. Do this each time we are
// called, as much JS specific code still goes via GetGlobalJSObject
NS_ASSERTION(mScriptContexts[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)] == mContext &&
mScriptGlobals[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)] == mJSObject,
"JS language contexts are confused");
return mScriptGlobals[lang_ndx];
NS_ASSERTION(lang == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
return mJSObject;
}
nsIScriptContext *
@ -1453,7 +1371,6 @@ nsGlobalWindow::GetGlobalJSObject()
return FastGetGlobalJSObject();
}
PRBool
nsGlobalWindow::WouldReuseInnerWindow(nsIDocument *aNewDocument)
{
@ -1591,14 +1508,14 @@ public:
NS_DECL_ISUPPORTS
WindowStateHolder(nsGlobalWindow *aWindow,
nsCOMPtr<nsISupports> aHolders[],
nsIXPConnectJSObjectHolder *aHolder,
nsNavigator *aNavigator,
nsLocation *aLocation,
nsIXPConnectJSObjectHolder *aOuterProto);
nsGlobalWindow* GetInnerWindow() { return mInnerWindow; }
nsISupports* GetInnerWindowHolder(PRUint32 aScriptTypeID)
{ return mInnerWindowHolders[NS_STID_INDEX(aScriptTypeID)]; }
nsIXPConnectJSObjectHolder *GetInnerWindowHolder()
{ return mInnerWindowHolder; }
nsNavigator* GetNavigator() { return mNavigator; }
nsLocation* GetLocation() { return mLocation; }
@ -1606,12 +1523,9 @@ public:
void DidRestoreWindow()
{
PRUint32 lang_ndx;
mInnerWindow = nsnull;
NS_STID_FOR_INDEX(lang_ndx) {
mInnerWindowHolders[lang_ndx] = nsnull;
}
mInnerWindowHolder = nsnull;
mNavigator = nsnull;
mLocation = nsnull;
mOuterProto = nsnull;
@ -1623,7 +1537,7 @@ protected:
nsGlobalWindow *mInnerWindow;
// We hold onto this to make sure the inner window doesn't go away. The outer
// window ends up recalculating it anyway.
nsCOMPtr<nsISupports> mInnerWindowHolders[NS_STID_ARRAY_UBOUND];
nsCOMPtr<nsIXPConnectJSObjectHolder> mInnerWindowHolder;
nsRefPtr<nsNavigator> mNavigator;
nsRefPtr<nsLocation> mLocation;
nsCOMPtr<nsIXPConnectJSObjectHolder> mOuterProto;
@ -1632,7 +1546,7 @@ protected:
NS_DEFINE_STATIC_IID_ACCESSOR(WindowStateHolder, WINDOWSTATEHOLDER_IID)
WindowStateHolder::WindowStateHolder(nsGlobalWindow *aWindow,
nsCOMPtr<nsISupports> aHolders[],
nsIXPConnectJSObjectHolder *aHolder,
nsNavigator *aNavigator,
nsLocation *aLocation,
nsIXPConnectJSObjectHolder *aOuterProto)
@ -1644,10 +1558,7 @@ WindowStateHolder::WindowStateHolder(nsGlobalWindow *aWindow,
NS_PRECONDITION(aWindow, "null window");
NS_PRECONDITION(aWindow->IsInnerWindow(), "Saving an outer window");
PRUint32 lang_ndx;
NS_STID_FOR_INDEX(lang_ndx) {
mInnerWindowHolders[lang_ndx] = aHolders[lang_ndx];
}
mInnerWindowHolder = aHolder;
aWindow->SuspendTimeouts();
}
@ -1793,19 +1704,13 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
mLastOpenedURI = aDocument->GetDocumentURI();
#endif
PRUint32 st_id; // we loop over all our context/globs lots!
NS_STID_FOR_ID(st_id) {
nsIScriptContext *langContext = GetScriptContextInternal(st_id);
if (langContext)
langContext->WillInitializeContext();
}
mContext->WillInitializeContext();
nsGlobalWindow *currentInner = GetCurrentInnerWindowInternal();
nsRefPtr<nsGlobalWindow> newInnerWindow;
nsCOMPtr<nsIDOMChromeWindow> thisChrome =
do_QueryInterface(static_cast<nsIDOMWindow *>(this));
PRBool thisChrome = IsChromeWindow();
nsCOMPtr<nsIXPConnectJSObjectHolder> navigatorHolder;
jsval nav;
@ -1822,12 +1727,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
// initialize the new inner window. If we don't, things
// (Object.prototype etc) could leak from the old outer to the new
// inner scope.
NS_STID_FOR_ID(st_id) {
nsIScriptContext *langContext = GetScriptContextInternal(st_id);
if (langContext)
langContext->ClearScope(mScriptGlobals[NS_STID_INDEX(st_id)],
PR_FALSE);
}
mContext->ClearScope(mJSObject, PR_FALSE);
if (reUseInnerWindow) {
// We're reusing the current inner window.
@ -1844,9 +1744,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
NS_ASSERTION(wsh, "What kind of weird state are you giving me here?");
newInnerWindow = wsh->GetInnerWindow();
NS_STID_FOR_ID(st_id) {
mInnerWindowHolders[NS_STID_INDEX(st_id)] = wsh->GetInnerWindowHolder(st_id);
}
mInnerWindowHolder = wsh->GetInnerWindowHolder();
// These assignments addref.
mNavigator = wsh->GetNavigator();
@ -1913,23 +1811,15 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
mCreatingInnerWindow = PR_TRUE;
// Every script context we are initialized with must create a
// new global.
rv = NS_OK;
NS_STID_FOR_ID(st_id) {
PRUint32 st_ndx = NS_STID_INDEX(st_id);
nsIScriptContext *this_ctx = GetScriptContextInternal(st_id);
if (this_ctx) {
void *&newGlobal = newInnerWindow->mScriptGlobals[st_ndx];
nsCOMPtr<nsISupports> &holder = mInnerWindowHolders[st_ndx];
rv |= this_ctx->CreateNativeGlobalForInner(sgo, isChrome,
&newGlobal,
getter_AddRefs(holder));
NS_ASSERTION(NS_SUCCEEDED(rv) && newGlobal && holder,
"Failed to get script global and holder");
if (st_id == nsIProgrammingLanguage::JAVASCRIPT) {
newInnerWindow->mJSObject = (JSObject *)newGlobal;
}
}
}
void *&newGlobal = (void *&)newInnerWindow->mJSObject;
nsCOMPtr<nsIXPConnectJSObjectHolder> &holder = mInnerWindowHolder;
rv = mContext->CreateNativeGlobalForInner(sgo, isChrome,
&newGlobal,
getter_AddRefs(holder));
NS_ASSERTION(NS_SUCCEEDED(rv) && newGlobal && holder,
"Failed to get script global and holder");
newInnerWindow->mJSObject = (JSObject *)newGlobal;
mCreatingInnerWindow = PR_FALSE;
Thaw();
@ -1996,20 +1886,13 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
// ensure that the outer window gets a new prototype so we don't
// leak prototype properties from the old inner window to the
// new one.
NS_STID_FOR_ID(st_id) {
nsIScriptContext *this_ctx = GetScriptContextInternal(st_id);
if (st_id == nsIProgrammingLanguage::JAVASCRIPT)
JS_BeginRequest((JSContext *)this_ctx->GetNativeContext());
if (this_ctx) {
this_ctx->InitContext(this);
// Now that both the the inner and outer windows are initialized
// let each script context do its magic to hook them together.
void *glob = mScriptGlobals[NS_STID_INDEX(st_id)];
this_ctx->ConnectToInner(newInnerWindow, glob);
}
if (st_id == nsIProgrammingLanguage::JAVASCRIPT)
JS_EndRequest((JSContext *)this_ctx->GetNativeContext());
}
JS_BeginRequest((JSContext *)mContext->GetNativeContext());
mContext->InitContext(this);
// Now that both the the inner and outer windows are initialized
// let the script context do its magic to hook them together.
mContext->ConnectToInner(newInnerWindow, mJSObject);
JS_EndRequest((JSContext *)mContext->GetNativeContext());
nsCOMPtr<nsIContent> frame = do_QueryInterface(GetFrameElementInternal());
if (frame && frame->GetOwnerDoc()) {
@ -2019,16 +1902,12 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
}
}
}
// Tell the contexts we have completed setting up the doc.
NS_STID_FOR_ID(st_id) {
// Add an extra ref in case we release mContext during GC.
nsCOMPtr<nsIScriptContext> this_ctx =
GetScriptContextInternal(st_id);
if (this_ctx) {
nsCOMPtr<nsIDOMDocument> dd(do_QueryInterface(aDocument));
this_ctx->DidSetDocument(dd, newInnerWindow->GetScriptGlobal(st_id));
}
}
// Add an extra ref in case we release mContext during GC.
nsCOMPtr<nsIScriptContext> kungFuDeathGrip(mContext);
nsCOMPtr<nsIDOMDocument> dd(do_QueryInterface(aDocument));
mContext->DidSetDocument(dd, newInnerWindow->mJSObject);
// Now that the prototype is all set up, install the global scope
// polluter. This must happen after the above prototype fixup. If
@ -2105,38 +1984,31 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
rv = newInnerWindow->InnerSetNewDocument(aDocument);
NS_ENSURE_SUCCESS(rv, rv);
NS_STID_FOR_ID(st_id) {
nsIScriptContext *this_ctx = GetScriptContextInternal(st_id);
if (this_ctx) {
// Initialize DOM classes etc on the inner window.
void *glob = newInnerWindow->mScriptGlobals[NS_STID_INDEX(st_id)];
rv = this_ctx->InitClasses(glob);
NS_ENSURE_SUCCESS(rv, rv);
// Initialize DOM classes etc on the inner window.
rv = mContext->InitClasses(mJSObject);
NS_ENSURE_SUCCESS(rv, rv);
if (navigatorHolder &&
st_id == nsIProgrammingLanguage::JAVASCRIPT) {
// Restore window.navigator onto the new inner window.
JSAutoRequest ar(cx);
if (navigatorHolder) {
// Restore window.navigator onto the new inner window.
JSAutoRequest ar(cx);
::JS_DefineProperty(cx, newInnerWindow->mJSObject, "navigator",
nav, nsnull, nsnull,
JSPROP_ENUMERATE | JSPROP_PERMANENT |
JSPROP_READONLY);
::JS_DefineProperty(cx, newInnerWindow->mJSObject, "navigator",
nav, nsnull, nsnull,
JSPROP_ENUMERATE | JSPROP_PERMANENT |
JSPROP_READONLY);
// The Navigator's prototype object keeps a reference to the
// window in which it was first created and can thus cause that
// window to stay alive for too long. Reparenting it here allows
// the window to be collected sooner.
nsIDOMNavigator* navigator =
static_cast<nsIDOMNavigator*>(mNavigator);
// The Navigator's prototype object keeps a reference to the
// window in which it was first created and can thus cause that
// window to stay alive for too long. Reparenting it here allows
// the window to be collected sooner.
nsIDOMNavigator* navigator =
static_cast<nsIDOMNavigator*>(mNavigator);
xpc->
ReparentWrappedNativeIfFound(cx, JSVAL_TO_OBJECT(nav),
newInnerWindow->mJSObject,
navigator,
getter_AddRefs(navigatorHolder));
}
}
xpc->
ReparentWrappedNativeIfFound(cx, JSVAL_TO_OBJECT(nav),
newInnerWindow->mJSObject,
navigator,
getter_AddRefs(navigatorHolder));
}
}
@ -2154,15 +2026,8 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
newInnerWindow->mChromeEventHandler = mChromeEventHandler;
}
NS_STID_FOR_ID(st_id) {
// Add an extra ref in case we release mContext during GC.
nsCOMPtr<nsIScriptContext> this_ctx =
GetScriptContextInternal(st_id);
if (this_ctx) {
this_ctx->GC();
this_ctx->DidInitializeContext();
}
}
mContext->GC();
mContext->DidInitializeContext();
if (!wrapper) {
rv = xpc->GetWrappedNativeOfJSObject(cx, mJSObject,
@ -2249,8 +2114,6 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
if (aDocShell == mDocShell)
return;
PRUint32 lang_id;
nsIScriptContext *langCtx;
// SetDocShell(nsnull) means the window is being torn down. Drop our
// reference to the script context, allowing it to be deleted
// later. Meanwhile, keep our weak reference to the script object
@ -2289,12 +2152,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
mDoc = nsnull;
}
// clear all scopes
NS_STID_FOR_ID(lang_id) {
langCtx = mScriptContexts[NS_STID_INDEX(lang_id)];
if (langCtx)
langCtx->ClearScope(mScriptGlobals[NS_STID_INDEX(lang_id)], PR_TRUE);
}
mContext->ClearScope(mJSObject, PR_TRUE);
ClearControllers();
@ -2308,25 +2166,14 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
mArgumentsOrigin = nsnull;
}
PRUint32 st_ndx;
mContext->GC();
mContext->FinalizeContext();
mContext = nsnull;
// Drop holders and tell each context to cleanup and release them now.
NS_ASSERTION(mContext == mScriptContexts[NS_STID_INDEX(nsIProgrammingLanguage::JAVASCRIPT)],
"Contexts confused");
NS_STID_FOR_INDEX(st_ndx) {
mInnerWindowHolders[st_ndx] = nsnull;
langCtx = mScriptContexts[st_ndx];
if (langCtx) {
langCtx->GC();
langCtx->FinalizeContext();
mScriptContexts[st_ndx] = nsnull;
}
}
#ifdef DEBUG
nsCycleCollector_DEBUG_shouldBeFreed(mContext);
nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
#endif
mContext = nsnull; // we nuked it above also
}
mDocShell = aDocShell; // Weak Reference
@ -2546,20 +2393,12 @@ nsGlobalWindow::DispatchDOMEvent(nsEvent* aEvent,
void
nsGlobalWindow::OnFinalize(PRUint32 aLangID, void *aObject)
{
if (!NS_STID_VALID(aLangID)) {
NS_ERROR("Invalid language ID");
return;
NS_ASSERTION(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
if (aObject == mJSObject) {
mJSObject = nsnull;
}
PRUint32 lang_ndx = NS_STID_INDEX(aLangID);
if (aObject == mScriptGlobals[lang_ndx]) {
mScriptGlobals[lang_ndx] = nsnull;
} else if (mScriptGlobals[lang_ndx]) {
NS_ERROR("Huh? Script language created more than one wrapper for this global!");
} else {
NS_WARNING("Weird, we're finalized with a null language global?");
}
if (aLangID==nsIProgrammingLanguage::JAVASCRIPT)
mJSObject = nsnull; // all relevant assertions and nulling done above.
}
void
@ -2623,17 +2462,7 @@ nsGlobalWindow::DefineArgumentsProperty(nsIArray *aArguments)
return NS_OK;
}
PRUint32 langID;
NS_STID_FOR_ID(langID) {
void *glob = GetScriptGlobal(langID);
ctx = GetScriptContext(langID);
if (glob && ctx) {
nsresult rv = ctx->SetProperty(glob, "arguments", aArguments);
NS_ENSURE_SUCCESS(rv, rv);
}
}
return NS_OK;
return GetContextInternal()->SetProperty(mJSObject, "arguments", aArguments);
}
//*****************************************************************************
@ -5813,7 +5642,7 @@ nsGlobalWindow::FinalClose()
if (cx) {
nsIScriptContext *currentCX = nsJSUtils::GetDynamicScriptContext(cx);
if (currentCX && currentCX == mContext) {
if (currentCX && currentCX == GetContextInternal()) {
// We ignore the return value here. If setting the termination function
// fails, it's better to fail to close the window than it is to crash
// (which is what would tend to happen if we did this synchronously
@ -8245,14 +8074,7 @@ void
nsGlobalWindow::ClearWindowScope(nsISupports *aWindow)
{
nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(aWindow));
PRUint32 lang_id;
NS_STID_FOR_ID(lang_id) {
nsIScriptContext *scx = sgo->GetScriptContext(lang_id);
if (scx) {
void *global = sgo->GetScriptGlobal(lang_id);
scx->ClearScope(global, PR_TRUE);
}
}
sgo->GetContext()->ClearScope(sgo->GetGlobalJSObject(), PR_TRUE);
}
//*****************************************************************************
@ -9218,7 +9040,7 @@ nsGlobalWindow::SaveWindowState(nsISupports **aState)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsISupports> state = new WindowStateHolder(inner,
mInnerWindowHolders,
mInnerWindowHolder,
mNavigator,
mLocation,
proto);

11
dom/base/nsGlobalWindow.h
View File

@ -392,12 +392,13 @@ public:
nsIScriptContext *GetScriptContextInternal(PRUint32 aLangID)
{
NS_ASSERTION(NS_STID_VALID(aLangID), "Invalid language");
NS_ASSERTION(aLangID == nsIProgrammingLanguage::JAVASCRIPT,
"We don't support this language ID");
if (mOuterWindow) {
return GetOuterWindowInternal()->mScriptContexts[NS_STID_INDEX(aLangID)];
return GetOuterWindowInternal()->mContext;
}
return mScriptContexts[NS_STID_INDEX(aLangID)];
return mContext;
}
nsGlobalWindow *GetOuterWindowInternal()
@ -781,8 +782,6 @@ protected:
nsString mStatus;
nsString mDefaultStatus;
// index 0->language_id 1, so index MAX-1 == language_id MAX
nsCOMPtr<nsIScriptContext> mScriptContexts[NS_STID_ARRAY_UBOUND];
void * mScriptGlobals[NS_STID_ARRAY_UBOUND];
nsGlobalWindowObserver* mObserver;
nsCOMPtr<nsIDOMCrypto> mCrypto;
@ -790,7 +789,7 @@ protected:
nsCOMPtr<nsIDOMStorage> mLocalStorage;
nsCOMPtr<nsIDOMStorage> mSessionStorage;
nsCOMPtr<nsISupports> mInnerWindowHolders[NS_STID_ARRAY_UBOUND];
nsCOMPtr<nsIXPConnectJSObjectHolder> mInnerWindowHolder;
nsCOMPtr<nsIPrincipal> mOpenerScriptPrincipal; // strong; used to determine
// whether to clear scope