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

Backed out changeset 70c3a3a74362 (bug 860941) for mochitest-3 timeouts on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2013-05-17 09:09:21 +01:00
parent 942e094488
commit 1cd07da10e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/base/nsGlobalWindow.cpp
View File

@ -1395,6 +1395,7 @@ nsGlobalWindow::CleanUp(bool aIgnoreModalDialog)
mInnerWindowHolder = nullptr; mInnerWindowHolder = nullptr;
mArguments = nullptr; mArguments = nullptr;
mArgumentsLast = nullptr;
mArgumentsOrigin = nullptr; mArgumentsOrigin = nullptr;
CleanupCachedXBLHandlers(this); CleanupCachedXBLHandlers(this);
@ -1623,6 +1624,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mControllers) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mControllers)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mArguments) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mArguments)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mArgumentsLast)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPerformance) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPerformance)
@ -1669,6 +1671,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mControllers) NS_IMPL_CYCLE_COLLECTION_UNLINK(mControllers)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mArguments) NS_IMPL_CYCLE_COLLECTION_UNLINK(mArguments)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mArgumentsLast)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mPerformance) NS_IMPL_CYCLE_COLLECTION_UNLINK(mPerformance)
@ -2735,6 +2738,7 @@ nsGlobalWindow::DetachFromDocShell()
// We got no new document after someone called // We got no new document after someone called
// SetArguments(), drop our reference to the arguments. // SetArguments(), drop our reference to the arguments.
mArguments = nullptr; mArguments = nullptr;
mArgumentsLast = nullptr;
mArgumentsOrigin = nullptr; mArgumentsOrigin = nullptr;
} }
@ -3151,7 +3155,9 @@ nsGlobalWindow::SetArguments(nsIArray *aArguments, nsIPrincipal *aOrigin)
nsGlobalWindow *currentInner = GetCurrentInnerWindowInternal(); nsGlobalWindow *currentInner = GetCurrentInnerWindowInternal();
if (mIsModalContentWindow && currentInner) { if (!mIsModalContentWindow) {
mArgumentsLast = aArguments;
} else if (currentInner) {
// SetArguments() is being called on a modal content window that // SetArguments() is being called on a modal content window that
// already has an inner window. This can happen when loading // already has an inner window. This can happen when loading
// javascript: URIs as modal content dialogs. In this case, we'll // javascript: URIs as modal content dialogs. In this case, we'll

1
dom/base/nsGlobalWindow.h
View File

@ -1114,6 +1114,7 @@ protected:
nsWeakPtr mOpener; nsWeakPtr mOpener;
nsCOMPtr<nsIControllers> mControllers; nsCOMPtr<nsIControllers> mControllers;
nsCOMPtr<nsIArray> mArguments; nsCOMPtr<nsIArray> mArguments;
nsCOMPtr<nsIArray> mArgumentsLast;
nsCOMPtr<nsIPrincipal> mArgumentsOrigin; nsCOMPtr<nsIPrincipal> mArgumentsOrigin;
nsRefPtr<Navigator> mNavigator; nsRefPtr<Navigator> mNavigator;
nsRefPtr<nsScreen> mScreen; nsRefPtr<nsScreen> mScreen;