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

Bug 948555. Fix a bogus assert in CompositorParent. r=mattwoodrow

Browse Source
This commit is contained in:
Nicholas Cameron 2013-12-11 16:51:00 +13:00
parent 52991836e6
commit 7bbc5b308c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/layers/ipc/CompositorParent.cpp
View File

@ -710,6 +710,7 @@ void
CompositorParent::InitializeLayerManager(const nsTArray<LayersBackend>& aBackendHints)
{
NS_ASSERTION(!mLayerManager, "Already initialised mLayerManager");
NS_ASSERTION(!mCompositor, "Already initialised mCompositor");
for (size_t i = 0; i < aBackendHints.Length(); ++i) {
RefPtr<Compositor> compositor;
@ -728,7 +729,11 @@ CompositorParent::InitializeLayerManager(const nsTArray<LayersBackend>& aBackend
#endif
}
MOZ_ASSERT(compositor, "Passed invalid backend hint");
if (!compositor) {
// We passed a backend hint for which we can't create a compositor.
// For example, we sometime pass LAYERS_NONE as filler in aBackendHints.
continue;
}
compositor->SetCompositorID(mCompositorID);
RefPtr<LayerManagerComposite> layerManager = new LayerManagerComposite(compositor);