From 2a1b7a54a6e63d8620fb1b3ab8e3d377743b87d9 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Fri, 3 Feb 2017 14:55:51 -0500 Subject: [PATCH] Bug 1336530 - Re-enable Android tests that were disabled in bug 1298218 and disable the assertion. r=tnikkel MozReview-Commit-ID: L7PnRvUkw5O --HG-- extra : rebase_source : 920d4418b72bd78998267be06062dae8f4b38316 --- gfx/layers/apz/test/mochitest/mochitest.ini | 3 --- layout/painting/FrameLayerBuilder.cpp | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gfx/layers/apz/test/mochitest/mochitest.ini b/gfx/layers/apz/test/mochitest/mochitest.ini index 632db85f5b446..09e62428ca767 100644 --- a/gfx/layers/apz/test/mochitest/mochitest.ini +++ b/gfx/layers/apz/test/mochitest/mochitest.ini @@ -42,18 +42,15 @@ [test_bug1304689.html] [test_bug1304689-2.html] [test_frame_reconstruction.html] - skip-if = (toolkit == 'android') # Test was permafailing on mobile after bug 1298218 [test_group_mouseevents.html] skip-if = (toolkit == 'android') # mouse events not supported on mobile [test_group_pointerevents.html] - skip-if = (toolkit == 'android') # Test was permafailing on mobile after bug 1298218 [test_group_touchevents.html] [test_group_wheelevents.html] skip-if = (toolkit == 'android') # wheel events not supported on mobile [test_group_zoom.html] skip-if = (toolkit != 'android') # only android supports zoom [test_interrupted_reflow.html] - skip-if = (toolkit == 'android') # Test was permafailing on mobile after bug 1298218 [test_layerization.html] skip-if = (os == 'android') # wheel events not supported on mobile [test_scroll_inactive_bug1190112.html] diff --git a/layout/painting/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp index a23ea800ba427..be63265c85c6b 100644 --- a/layout/painting/FrameLayerBuilder.cpp +++ b/layout/painting/FrameLayerBuilder.cpp @@ -5227,7 +5227,9 @@ ContainerState::Finish(uint32_t* aTextContentFlags, { mPaintedLayerDataTree.Finish(); - if (!mParameters.mForEventsAndPluginsOnly) { + if (!mParameters.mForEventsAndPluginsOnly && !gfxPrefs::LayoutUseContainersForRootFrames()) { + // Bug 1336544 tracks re-enabling this assertion in the + // gfxPrefs::LayoutUseContainersForRootFrames() case. NS_ASSERTION(mContainerBounds.IsEqualInterior(mAccumulatedChildBounds), "Bounds computation mismatch"); }