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 589297 - nsWindow::GetViewWidget crashes when can't find view. r=romaxa a=npodb

Browse Source
This commit is contained in:
Tatiana Meshkova 2010-08-20 18:12:14 -07:00
parent f0e27fabb5
commit a227e47b35
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -674,7 +674,7 @@ nsWindow::Update()
QWidget* nsWindow::GetViewWidget()
{
NS_ASSERTION(mWidget, "Calling GetViewWidget without mWidget created");
if (!mWidget || !mWidget->scene())
if (!mWidget || !mWidget->scene() || !mWidget->scene()->views().size())
return nsnull;
NS_ASSERTION(mWidget->scene()->views().size() == 1, "Not exactly one view for our scene!");
@ -1739,8 +1739,11 @@ nsWindow::NativeResize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
mNeedsResize = PR_FALSE;
#ifndef MOZ_ENABLE_MEEGOTOUCH
if (mIsTopLevel && XRE_GetProcessType() == GeckoProcessType_Default)
GetViewWidget()->resize(aWidth, aHeight);
if (mIsTopLevel && XRE_GetProcessType() == GeckoProcessType_Default) {
QWidget *widget = GetViewWidget();
NS_ENSURE_TRUE(widget,);
widget->resize(aWidth, aHeight);
}
#endif
mWidget->resize( aWidth, aHeight);
@ -1762,8 +1765,11 @@ nsWindow::NativeResize(PRInt32 aX, PRInt32 aY,
#ifndef MOZ_ENABLE_MEEGOTOUCH
if (mIsTopLevel) {
if (XRE_GetProcessType() == GeckoProcessType_Default)
GetViewWidget()->setGeometry(aX, aY, aWidth, aHeight);
if (XRE_GetProcessType() == GeckoProcessType_Default) {
QWidget *widget = GetViewWidget();
NS_ENSURE_TRUE(widget,);
widget->setGeometry(aX, aY, aWidth, aHeight);
}
}
#endif