Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing 169951, crash caused by plugin calling window.close() from an event because we destroy the frame tree and plugin's native window. This fix puts that destruction caused by a window.close() from Javascript on a PLEvent. r=jkeiser sr=jst, a=asa

Browse Source
This commit is contained in:
peterlubczynski%netscape.com 2003-04-25 22:24:37 +00:00
parent ccf82f0716
commit 76c4556089
1 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dom/src/base/nsGlobalWindow.cpp
View File

@ -138,6 +138,7 @@
#include "nsIConsoleService.h"
#include "nsIControllerContext.h"
#include "nsGlobalWindowCommands.h"
#include "nsAutoPtr.h"
#include "plbase64.h"
@ -3165,6 +3166,48 @@ GlobalWindowImpl::GetFrames(nsIDOMWindow** aFrames)
return NS_OK;
}
struct nsCloseEvent : public PLEvent {
nsCloseEvent (GlobalWindowImpl *aWindow)
: mWindow(aWindow)
{
}
void HandleEvent() {
if (mWindow)
mWindow->ReallyCloseWindow();
}
nsresult PostCloseEvent();
nsRefPtr<GlobalWindowImpl> mWindow;
};
static void PR_CALLBACK HandleCloseEvent(nsCloseEvent* aEvent)
{
aEvent->HandleEvent();
}
static void PR_CALLBACK DestroyCloseEvent(nsCloseEvent* aEvent)
{
delete aEvent;
}
nsresult
nsCloseEvent::PostCloseEvent()
{
nsCOMPtr<nsIEventQueueService> eventService(do_GetService(kEventQueueServiceCID));
if (eventService) {
nsCOMPtr<nsIEventQueue> eventQueue;
eventService->GetThreadEventQueue(PR_GetCurrentThread(), getter_AddRefs(eventQueue));
if (eventQueue) {
PL_InitEvent(this, nsnull, (PLHandleEventProc) ::HandleCloseEvent, (PLDestroyEventProc) ::DestroyCloseEvent);
return eventQueue->PostEvent(this);
}
}
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP
GlobalWindowImpl::Close()
{
@ -3268,10 +3311,31 @@ GlobalWindowImpl::Close()
}
}
// If we get past the above we're closing the window right now.
return ReallyCloseWindow();
// We may have plugins on the page that have issued this close from their
// event loop and because we currently destroy the plugin window with
// frames, we crash. So, if we are called from Javascript, post an event
// to really close the window.
rv = NS_ERROR_FAILURE;
if (!IsCallerChrome()) {
nsCloseEvent *ev = new nsCloseEvent(this);
if (ev) {
rv = ev->PostCloseEvent();
if (NS_FAILED(rv)) {
delete ev;
}
} else rv = NS_ERROR_OUT_OF_MEMORY;
}
if (NS_FAILED(rv))
rv = ReallyCloseWindow();
return rv;
}
NS_IMETHODIMP
GlobalWindowImpl::ReallyCloseWindow()
{