From 418760396bf552f1ea2127c6ff2c7992b628632d Mon Sep 17 00:00:00 2001 From: Nicholas Cameron Date: Mon, 25 Nov 2013 20:07:31 +1300 Subject: [PATCH] Bug 942649. Remove a duplicate call to CreateCompositor. r=mattwoodrow --- widget/windows/nsWindow.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 6cb40833eb7..80717ff2be3 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -3337,16 +3337,7 @@ nsWindow::GetLayerManager(PLayerTransactionChild* aShadowManager, // Fall back to software if we couldn't use any hardware backends. if (!mLayerManager) { - // Try to use an async compositor first, if possible - if (ShouldUseOffMainThreadCompositing()) { - // e10s uses the parameter to pass in the shadow manager from the TabChild - // so we don't expect to see it there since this doesn't support e10s. - NS_ASSERTION(aShadowManager == nullptr, "Async Compositor not supported with e10s"); - CreateCompositor(); - } - - if (!mLayerManager) - mLayerManager = CreateBasicLayerManager(); + mLayerManager = CreateBasicLayerManager(); } }