Bug 1336530 - Re-enable Android tests that were disabled in bug 12982…

…18 and disable the assertion. r=tnikkel MozReview-Commit-ID: L7PnRvUkw5O --HG-- extra : rebase_source : 920d4418b72bd78998267be06062dae8f4b38316
dothq · Feb 3, 2017 · 2a1b7a5 · 2a1b7a5
1 parent 6553b77
commit 2a1b7a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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");
   }