From 5b431ef3759fd33d69c63c44c516752e1164c45b Mon Sep 17 00:00:00 2001 From: Matt Woodrow Date: Mon, 16 Dec 2013 21:05:20 +1300 Subject: [PATCH] Bug 913503 - Fix reversed if() condition to fix bustage. --- layout/base/nsDisplayList.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 810796540f9..259b896e76f 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -1207,15 +1207,15 @@ void nsDisplayList::PaintForFrame(nsDisplayListBuilder* aBuilder, bool temp = aBuilder->SetIsCompositingCheap(layerManager->IsCompositingCheap()); LayerManager::EndTransactionFlags flags = LayerManager::END_DEFAULT; if (layerManager->NeedsWidgetInvalidation()) { + if (aFlags & PAINT_NO_COMPOSITE) { + flags = LayerManager::END_NO_COMPOSITE; + } + } else { // Client layer managers never composite directly, so // we don't need to worry about END_NO_COMPOSITE. if (aBuilder->WillComputePluginGeometry()) { flags = LayerManager::END_NO_REMOTE_COMPOSITE; } - } else { - if (aFlags & PAINT_NO_COMPOSITE) { - flags = LayerManager::END_NO_COMPOSITE; - } } layerManager->EndTransaction(FrameLayerBuilder::DrawThebesLayer,