Backed out changeset e2e57c225fd0 (bug 1276107)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 02 Jun 2016 22:54:30 +0200
changeset 339267 3a84a262f3199840e9986d19589dc4d84a08cec0
parent 339266 b1647e5d98a4e470949361f8e0211c496c68a358
child 339268 2529d7543c234bc34693e41621edb9bff7b80d37
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1276107
milestone49.0a1
backs oute2e57c225fd00677a1740c6546c1ef99389958dc
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e2e57c225fd0 (bug 1276107)
gfx/layers/apz/test/mochitest/helper_scroll_inactive_zindex.html
gfx/layers/apz/test/mochitest/mochitest.ini
gfx/layers/apz/test/mochitest/test_group_wheelevents.html
deleted file mode 100644
--- a/gfx/layers/apz/test/mochitest/helper_scroll_inactive_zindex.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<head>
-  <meta name="viewport" content="width=device-width; initial-scale=1.0">
-  <title>Wheel-scrolling over inactive subframe with z-index</title>
-  <script type="application/javascript" src="apz_test_native_event_utils.js"></script>
-  <script type="application/javascript" src="apz_test_utils.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>
-  <script type="application/javascript">
-
-function* test(testDriver) {
-  var subframe = document.getElementById('scroll');
-
-  // scroll over the middle of the subframe, and make sure that it scrolls,
-  // not the page
-  var scrollPos = subframe.scrollTop;
-  yield moveMouseAndScrollWheelOver(subframe, 100, 100, testDriver);
-  dump("after scroll, subframe.scrollTop = " + subframe.scrollTop + "\n");
-  ok(subframe.scrollTop > scrollPos, "subframe scrolled after wheeling over it");
-}
-
-waitUntilApzStable()
-.then(runContinuation(test))
-.then(subtestDone);
-
-  </script>
-  <style>
-    #scroll {
-      width: 200px;
-      height: 200px;
-      overflow: scroll;
-    }
-    #scrolled {
-      width: 200px;
-      height: 1000px; /* so the subframe has room to scroll */
-      z-index: 2;
-      background: linear-gradient(red, blue); /* so you can see it scroll */
-      transform: translateZ(0px); /* to force active layers */ 
-      will-change: transform; /* to force active layers */
-    }
-  </style>
-</head>
-<body>
-  <div id="scroll">
-    <div id="scrolled"></div>
-  </div>
-  <div style="height: 5000px;"></div><!-- So the page is scrollable as well -->
-</body>
-</head>
--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@@ -16,17 +16,16 @@ support-files =
   helper_scroll_on_position_fixed.html
   helper_tap_passive.html
   helper_click.html
   helper_drag_click.html
   helper_bug1271432.html
   helper_touch_action.html
   helper_touch_action_regions.html
   helper_scroll_inactive_perspective.html
-  helper_scroll_inactive_zindex.html
 tags = apz
 [test_bug982141.html]
 [test_bug1151663.html]
 [test_wheel_scroll.html]
 skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
 [test_wheel_transactions.html]
 skip-if = (os == 'android') || (os == 'b2g') || (buildapp == 'mulet') # wheel events not supported on mobile; see bug 1164274 for mulet
 [test_bug1151667.html]
--- a/gfx/layers/apz/test/mochitest/test_group_wheelevents.html
+++ b/gfx/layers/apz/test/mochitest/test_group_wheelevents.html
@@ -17,18 +17,17 @@ var prefs = [
   // the target APZC after each such movement.
   ['mousewheel.transaction.ignoremovedelay', 0],
   ['mousewheel.transaction.timeout', 0]
 ]
 
 var subtests = [
   {'file': 'helper_scroll_on_position_fixed.html', 'prefs': prefs},
   {'file': 'helper_bug1271432.html', 'prefs': prefs},
-  {'file': 'helper_scroll_inactive_perspective.html', 'prefs': prefs},
-  {'file': 'helper_scroll_inactive_zindex.html', 'prefs': prefs}
+  {'file': 'helper_scroll_inactive_perspective.html', 'prefs': prefs}
 ];
 
 if (isApzEnabled()) {
   SimpleTest.waitForExplicitFinish();
   window.onload = function() {
     runSubtestsSeriallyInFreshWindows(subtests)
     .then(SimpleTest.finish);
   };