author | Ryan VanderMeulen <ryanvm@gmail.com> |
Mon, 29 Feb 2016 00:03:01 -0500 | |
changeset 324236 | dfb1e32a70619c568762470f32e22cc2907debb4 |
parent 324235 | b5d5f42ed917c073f2edaeb01e97f88bdaa4d1fd |
child 324237 | 7882aa8df614f30d441d924afcc93c1539cc3118 |
push id | 1128 |
push user | jlund@mozilla.com |
push date | Wed, 01 Jun 2016 01:31:59 +0000 |
treeherder | mozilla-release@fe0d30de989d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1251659, 967796 |
milestone | 47.0a1 |
backs out | 3a116d8cb42f45daf1467692c91afc2a2c7f0985 b61ca87b91e1ac48a8e05d0baff97f3be4af623d |
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
|
--- a/dom/events/test/mochitest.ini +++ b/dom/events/test/mochitest.ini @@ -130,17 +130,17 @@ skip-if = toolkit == 'android' #CRASH_DU skip-if = buildapp == 'b2g' # b2g(failing when the test gets moved around, and on debug) [test_bug924087.html] [test_bug930374-content.html] [test_bug944011.html] [test_bug944847.html] [test_bug946632.html] skip-if = buildapp == 'b2g' [test_bug967796.html] -skip-if = toolkit == "gonk" +skip-if = toolkit == "gonk" || e10s [test_bug985988.html] [test_bug998809.html] [test_bug1017086_disable.html] support-files = bug1017086_inner.html [test_bug1017086_enable.html] support-files = bug1017086_inner.html [test_bug1079236.html] [test_bug1145910.html]
--- a/dom/events/test/test_bug822898.html +++ b/dom/events/test/test_bug822898.html @@ -304,16 +304,17 @@ function testPointerEventCTORS() is(e[def], p[def], "PointerEvent: Wrong event init value for " + def + "!"); } } } nextTest(); } function runTests() { + SpecialPowers.setBoolPref("dom.w3c_pointer_events.enabled", true); // Enable Pointer Events testTarget = document.getElementById("testTarget"); parent = testTarget.parentNode; gOnPointerPropHandled = new Array; iframeBody = document.getElementById("subFrame").contentWindow.document.body; tests.push(createTestEventValue("pointerdown")); tests.push(createTestEventValue("pointermove")); tests.push(createTestEventValue("pointerup"));
--- a/dom/events/test/test_bug967796.html +++ b/dom/events/test/test_bug967796.html @@ -15,22 +15,20 @@ https://bugzilla.mozilla.org/show_bug.cg <div id="content" style="display: none"> </div> <pre id="test"> <script type="application/javascript"> /** Test for Bug 967796 **/ -SimpleTest.waitForExplicitFinish(); +SpecialPowers.setBoolPref("dom.w3c_pointer_events.enabled", true); // Enable Pointer Events -SimpleTest.waitForFocus(function() { - SpecialPowers.pushPrefEnv({"set": [["dom.w3c_pointer_events.enabled", true]]}, runTests); - }); - +SimpleTest.waitForExplicitFinish(); +SimpleTest.waitForFocus(runTests); var outer; var middle; var inner; var outside; var container; var file; var iframe; var checkRelatedTarget = false; @@ -158,16 +156,18 @@ function runTests() { Array.from(document.querySelectorAll('*')) .concat([iframe.contentDocument.body.firstChild, iframe.contentDocument.body.lastChild]) .forEach((elt) => { elt.onpointerenter = null; elt.onpointerleave = null; elt.onpointerenter = null; elt.onpointerleave = null; }); + SpecialPowers.clearUserPref("dom.w3c_pointer_events.enabled"); // Disable Pointer Events + SimpleTest.finish(); } function penter(evt) { ++pointerentercount; evt.stopPropagation(); if (expectedPointerEnterTargets.length) { var t = expectedPointerEnterTargets.shift();