Bug 1333122 - Use the CompositorOptions to determine the appropriate LayerManager to create for content-process tabs. r=dvander

MozReview-Commit-ID: AhEpuPa2heV
This commit is contained in:
Kartikaya Gupta
2017-01-24 08:03:08 -05:00
parent 32ec561701
commit 1b1d888dd1
4 changed files with 36 additions and 13 deletions

View File

@@ -589,7 +589,10 @@ PuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
LayerManagerPersistence aPersistence)
{
if (!mLayerManager) {
if (gfxPrefs::WebRenderEnabled()) {
if (!mTabChild) {
return nullptr;
}
if (mTabChild->GetCompositorOptions().UseWebRender()) {
mLayerManager = new WebRenderLayerManager(this);
} else {
mLayerManager = new ClientLayerManager(this);
@@ -605,7 +608,8 @@ PuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
LayerManager*
PuppetWidget::RecreateLayerManager(PLayerTransactionChild* aShadowManager)
{
if (gfxPrefs::WebRenderEnabled()) {
MOZ_ASSERT(mTabChild);
if (mTabChild->GetCompositorOptions().UseWebRender()) {
mLayerManager = new WebRenderLayerManager(this);
} else {
mLayerManager = new ClientLayerManager(this);