Bug 1388356 - add pref apz.test.fails_with_native_injection for windows to allow touch based events to work in windows 10 tests. r=kats
authorJoel Maher <jmaher@mozilla.com>
Tue, 08 Aug 2017 15:08:04 -0400
changeset 373534 5218fdb57fa7c2866bc32d44556e318fcec7887b
parent 373533 9a678b3efcd23bbe3a62b76c8113384ec7714cec
child 373535 809aee6a234efaff8b46c7b3e93e645d8b31167c
push id32304
push usercbook@mozilla.com
push dateWed, 09 Aug 2017 09:37:21 +0000
treeherdermozilla-central@4c5fbf493763 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1388356
milestone57.0a1
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
Bug 1388356 - add pref apz.test.fails_with_native_injection for windows to allow touch based events to work in windows 10 tests. r=kats MozReview-Commit-ID: 3QJ1aFpxGxY
dom/events/test/pointerevents/test_touch_action.html
gfx/layers/apz/test/mochitest/test_group_touchevents.html
--- a/dom/events/test/pointerevents/test_touch_action.html
+++ b/dom/events/test/pointerevents/test_touch_action.html
@@ -3,16 +3,18 @@
  <head>
   <meta charset="utf-8">
   <title>W3C pointerevents/*touch-action*.html tests in Mochitest form</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="apz_test_utils.js"></script>
   <script type="application/javascript" src="apz_test_native_event_utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript">
+var isWindows = (getPlatform() == "windows");
+
 var apz_touch_action_prefs = [
   // Obviously we need touch-action support enabled for testing touch-action.
   ["layout.css.touch_action.enabled", true],
   // Dropping the touch slop to 0 makes the tests easier to write because
   // we can just do a one-pixel drag to get over the pan threshold rather
   // than having to hard-code some larger value.
   ["apz.touch_start_tolerance", "0.0"],
   // The touchstart from the drag can turn into a long-tap if the touch-move
@@ -25,16 +27,17 @@ var apz_touch_action_prefs = [
   // want those pans to turn into fling animations, so we increase the
   // fling-stop threshold velocity to absurdly high.
   ["apz.fling_stopped_threshold", "10000"],
   // The helper_div_pan's div gets a displayport on scroll, but if the
   // test takes too long the displayport can expire before the new scroll
   // position is synced back to the main thread. So we disable displayport
   // expiry for these tests.
   ["apz.displayport_expiry_ms", 0],
+  ["apz.test.fails_with_native_injection", isWindows],
 ];
 
 function apzScriptInjector(name) {
   return function(childWin) {
     childWin._ACTIVE_TEST_NAME = name;
     injectScript('/tests/SimpleTest/paint_listener.js', childWin)()
     .then(injectScript('apz_test_utils.js', childWin))
     .then(injectScript('apz_test_native_event_utils.js', childWin))
--- a/gfx/layers/apz/test/mochitest/test_group_touchevents.html
+++ b/gfx/layers/apz/test/mochitest/test_group_touchevents.html
@@ -30,16 +30,17 @@ var basic_pan_prefs = [
   // expiry for these tests.
   ["apz.displayport_expiry_ms", 0],
 ];
 
 var touch_action_prefs = basic_pan_prefs.slice(); // make a copy
 touch_action_prefs.push(["layout.css.touch_action.enabled", true]);
 
 var isWindows = (getPlatform() == "windows");
+touch_action_prefs.push(["apz.test.fails_with_native_injection", isWindows]);
 
 var subtests = [
   // Simple tests to exercise basic panning behaviour
   {'file': 'helper_basic_pan.html', 'prefs': basic_pan_prefs},
   {'file': 'helper_div_pan.html', 'prefs': basic_pan_prefs},
   {'file': 'helper_iframe_pan.html', 'prefs': basic_pan_prefs},
 
   // Simple test to exercise touch-tapping behaviour