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

Bug 485579. Fix possible crash when closing tabs using cairo-qt. r=vlad, a=beltzner

Browse Source
This commit is contained in:
Tobias Hunger 2009-03-27 12:35:27 +01:00
parent 080b6bec9f
commit ec1bc87655
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/src/qt/mozqwidget.cpp
View File

@ -10,6 +10,12 @@ MozQWidget::MozQWidget(nsWindow *receiver, QWidget *parent,
setAttribute(Qt::WA_QuitOnClose, false);
}
MozQWidget::~MozQWidget()
{
if (mReceiver)
mReceiver->QWidgetDestroyed();
}
bool MozQWidget::event(QEvent *e)
{
nsEventStatus status = nsEventStatus_eIgnore;

2
widget/src/qt/mozqwidget.h
View File

@ -14,6 +14,8 @@ public:
MozQWidget(nsWindow* receiver, QWidget *parent,
const char *name, int f);
~MozQWidget();
/**
* Mozilla helper.
*/

9
widget/src/qt/nsWindow.cpp
View File

@ -109,6 +109,8 @@
#include "qx11info_x11.h"
#endif
#include <QtCore/QDebug>
#include <execinfo.h>
#include "mozqwidget.h"
@ -316,6 +318,7 @@ nsWindow::Destroy(void)
mMozQWidget->deleteLater();
}
mMozQWidget = nsnull;
mDrawingArea = nsnull;
OnDestroy();
@ -1968,6 +1971,12 @@ nsWindow::ConvertBorderStyles(nsBorderStyle aStyle)
return w;
}
void nsWindow::QWidgetDestroyed()
{
mDrawingArea = nsnull;
mMozQWidget = nsnull;
}
NS_IMETHODIMP
nsWindow::MakeFullScreen(PRBool aFullScreen)
{

2
widget/src/qt/nsWindow.h
View File

@ -208,6 +208,8 @@ public:
void LoseFocus();
qint32 ConvertBorderStyles(nsBorderStyle aStyle);
void QWidgetDestroyed();
/***** from CommonWidget *****/