Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 545078 - Crash [@ mozilla::widget::TaskbarPreview::CanMakeTaskbarCalls() ] r=jmathies

Browse Source
This commit is contained in:
Rob Arnold 2010-03-20 18:09:00 -04:00
parent 010ceb4326
commit abc2950b98
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
widget/src/windows/TaskbarPreview.cpp
View File

@ -153,6 +153,13 @@ TaskbarPreview::SetVisible(PRBool visible) {
if (mVisible == visible) return NS_OK;
mVisible = visible;
// If the nsWindow has already been destroyed but the caller is still trying
// to use it then just pretend that everything succeeded. The caller doesn't
// actually have a way to detect this since it's the same case as when we
// CanMakeTaskbarCalls returns false.
if (!mWnd)
return NS_OK;
return visible ? Enable() : Disable();
}
@ -288,10 +295,20 @@ TaskbarPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) {
PRBool
TaskbarPreview::CanMakeTaskbarCalls() {
nsWindow *window = nsWindow::GetNSWindowPtr(mWnd);
NS_ASSERTION(window, "Cannot use taskbar previews in an embedded context!");
return mVisible && window->HasTaskbarIconBeenCreated();
// If the nsWindow has already been destroyed and we know it but our caller
// clearly doesn't so we can't make any calls.
if (!mWnd)
return PR_FALSE;
// Certain functions like SetTabOrder seem to require a visible window. During
// window close, the window seems to be hidden before being destroyed.
if (!::IsWindowVisible(mWnd))
return PR_FALSE;
if (mVisible) {
nsWindow *window = nsWindow::GetNSWindowPtr(mWnd);
NS_ASSERTION(window, "Could not get nsWindow from HWND");
return window->HasTaskbarIconBeenCreated();
}
return PR_FALSE;
}
WindowHook&