Bug 1180688 - Backout previous fix to try another solution. r=me

This commit is contained in:
Nicolas Silva 2015-07-13 16:46:44 +02:00
Родитель f80f5c4878
Коммит ee25273473
1 изменённых файлов: 6 добавлений и 12 удалений

Просмотреть файл

@ -1111,10 +1111,7 @@ nsBaseWidget::GetPreferredCompositorBackends(nsTArray<LayersBackend>& aHints)
aHints.AppendElement(LayersBackend::LAYERS_OPENGL);
}
// At the moment, BasicCompositor is broken on mac.
#ifndef XP_MACOSX
aHints.AppendElement(LayersBackend::LAYERS_BASIC);
#endif
}
nsIDocument*
@ -1170,13 +1167,6 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
return;
}
nsTArray<LayersBackend> backendHints;
GetPreferredCompositorBackends(backendHints);
if (backendHints.IsEmpty()) {
mLayerManager = nullptr;
return;
}
CreateCompositorVsyncDispatcher();
mCompositorParent = NewCompositorParent(aWidth, aHeight);
nsRefPtr<ClientLayerManager> lm = new ClientLayerManager(this);
@ -1194,10 +1184,14 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
TextureFactoryIdentifier textureFactoryIdentifier;
PLayerTransactionChild* shadowManager = nullptr;
nsTArray<LayersBackend> backendHints;
GetPreferredCompositorBackends(backendHints);
bool success = false;
shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
backendHints, 0, &textureFactoryIdentifier, &success);
if (!backendHints.IsEmpty()) {
shadowManager = mCompositorChild->SendPLayerTransactionConstructor(
backendHints, 0, &textureFactoryIdentifier, &success);
}
ShadowLayerForwarder* lf = lm->AsShadowForwarder();