corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from m-c. manually merging modules/plugin/test/testplugin/nptest.cpp dom/plugins/PluginModuleChild.cpp.

Browse Source
This commit is contained in:
Doug Turner
2010-03-26 14:22:48 -07:00
parent 7bed571d87 4dcc3ab0fc
commit 28cfa9d63f
820 changed files with 77367 additions and 30293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,10 +554,6 @@ nsWindow::SetSizeMode(PRInt32 aMode)
widget->showMinimized();
break;
case nsSizeMode_Fullscreen:
// Some versions of Qt (4.6.x) crash in XSetInputFocus due to
// unsynchronized window activation. Sync here to avoid such
// cases.
XSync(QX11Info().display(), False);
widget->showFullScreen();
break;
@@ -577,16 +573,23 @@ nsWindow::SetSizeMode(PRInt32 aMode)
// set to visible if one of their ancestors is invisible)
static void find_first_visible_parent(QGraphicsItem* aItem, QGraphicsItem*& aVisibleItem)
{
if (!aItem)
return;
NS_ENSURE_TRUE(aItem, );
if (!aVisibleItem && aItem->isVisible())
aVisibleItem = aItem;
else if (aVisibleItem && !aItem->isVisible())
aVisibleItem = nsnull;
// check further up the chain
find_first_visible_parent(aItem->parentItem(), aVisibleItem);
aVisibleItem = nsnull;
QGraphicsItem* parItem = nsnull;
while (!aVisibleItem) {
if (aItem->isVisible())
aVisibleItem = aItem;
else {
parItem = aItem->parentItem();
if (parItem)
aItem = parItem;
else {
aItem->setVisible(true);
aVisibleItem = aItem;
}
}
}
}
NS_IMETHODIMP
@@ -599,7 +602,10 @@ nsWindow::SetFocus(PRBool aRaise)
if (!mWidget)
return NS_ERROR_FAILURE;
// Because QGraphicsItem cannot get the focus if they are
if (mWidget->hasFocus())
return NS_OK;
// Because QGraphicsItem cannot get the focus if they are
// invisible, we look up the chain, for the lowest visible
// parent and focus that one
QGraphicsItem* realFocusItem = nsnull;
@@ -672,6 +678,8 @@ nsWindow::Invalidate(const nsIntRect &aRect,
if (!mWidget)
return NS_OK;
mDirtyScrollArea = mDirtyScrollArea.united(QRect(aRect.x, aRect.y, aRect.width, aRect.height));
mWidget->update(aRect.x, aRect.y, aRect.width, aRect.height);
// QGraphicsItems cannot trigger a repaint themselves, so we start it on the view
@@ -1947,10 +1955,6 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
mLastSizeMode = mSizeMode;
mSizeMode = nsSizeMode_Fullscreen;
// Some versions of Qt (4.6.x) crash in XSetInputFocus due to
// unsynchronized window activation. Sync here to avoid such
// cases.
XSync(QX11Info().display(), False);
widget->showFullScreen();
}
else {
@@ -1971,10 +1975,10 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
break;
}
}
NS_ASSERTION(mLastSizeMode != nsSizeMode_Fullscreen,
"mLastSizeMode should never be fullscreen");
return NS_OK;
return nsBaseWidget::MakeFullScreen(aFullScreen);
}
NS_IMETHODIMP