wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow top-level window changes to the remembered compositor type. (bug 1211109 part 3, r=mattwoodrow)

Browse Source
This commit is contained in:
David Anderson 2015-10-05 23:39:28 -07:00
parent 07ff755338
commit e1d5f8bc99
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/thebes/gfxPlatform.cpp
View File

@ -2208,7 +2208,10 @@ gfxPlatform::NotifyCompositorCreated(LayersBackend aBackend)
return;
}
NS_ASSERTION(mCompositorBackend == LayersBackend::LAYERS_NONE, "Compositor backend changed.");
if (mCompositorBackend != LayersBackend::LAYERS_NONE) {
gfxCriticalNote << "Compositors might be mixed ("
<< int(mCompositorBackend) << "," << int(aBackend) << ")";
}
// Set the backend before we notify so it's available immediately.
mCompositorBackend = aBackend;

6
widget/nsBaseWidget.cpp
View File

@ -1132,7 +1132,11 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
mLayerManager = lm.forget();
gfxPlatform::GetPlatform()->NotifyCompositorCreated(mLayerManager->GetCompositorBackendType());
if (mWindowType == eWindowType_toplevel) {
// Only track compositors for top-level windows, since other window types
// may use the basic compositor.
gfxPlatform::GetPlatform()->NotifyCompositorCreated(mLayerManager->GetCompositorBackendType());
}
}
bool nsBaseWidget::ShouldUseOffMainThreadCompositing()