From c2e5edf5eeb40a5261184b86d64c298c4e85554c Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Sat, 2 Apr 2016 10:30:31 -0700 Subject: [PATCH] Bug 1251905, part 4 - Use pushPrefEnv in testContinuousTrustedEvents(). r=masayuki --- .../test/test_continuous_wheel_events.html | 68 +++++++++++-------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/dom/events/test/test_continuous_wheel_events.html b/dom/events/test/test_continuous_wheel_events.html index 7e6ee4acfe2b..507a8dc5556a 100644 --- a/dom/events/test/test_continuous_wheel_events.html +++ b/dom/events/test/test_continuous_wheel_events.html @@ -108,7 +108,7 @@ function* prepareScrollUnits() // legacy mouse scroll events when its lineOrPageDelta value is not zero or // accumulated delta values of pixel scroll events of pixel only device // become over the line height. -function testContinuousTrustedEvents() +function* testContinuousTrustedEvents() { const kSynthesizedWheelEventTests = [ { description: "Simple horizontal wheel event by pixels (16.0 - 1) #1", @@ -2667,8 +2667,9 @@ function testContinuousTrustedEvents() // Tests for accumulation delta when delta_multiplier_is customized. { description: "lineOrPageDelta should be recomputed by ESM (pixel) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 200); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 300); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 200], + ["mousewheel.default.delta_multiplier_y", 300]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_PIXEL, deltaX: gHorizontalLine / 4, deltaY: gLineHeight / 8, deltaZ: 0, @@ -2720,15 +2721,17 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.floor((gHorizontalLine / 4 + 1) * 2) }, vertical: { expected: true, preventDefault: false, detail: Math.floor((gLineHeight / 8 + 1) * 3) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, }, { description: "lineOrPageDelta should be recomputed by ESM (pixel, negative, shift) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.with_shift.delta_multiplier_x", 200); - SpecialPowers.setIntPref("mousewheel.with_shift.delta_multiplier_y", 300); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.with_shift.delta_multiplier_x", 200], + ["mousewheel.with_shift.delta_multiplier_y", 300]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_PIXEL, deltaX: -gHorizontalLine / 4, deltaY: -gLineHeight / 8, deltaZ: 0, @@ -2780,15 +2783,17 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.ceil(-(gHorizontalLine / 4 + 1) * 2) }, vertical: { expected: true, preventDefault: false, detail: Math.ceil(-(gLineHeight / 8 + 1) * 3) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.with_shift.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.with_shift.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.with_shift.delta_multiplier_x", 100], + ["mousewheel.with_shift.delta_multiplier_y", 100]]}, + continueTest); }, }, { description: "lineOrPageDelta should be recomputed by ESM (line) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 200); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 200], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_LINE, deltaX: 0.3, deltaY: 0.4, deltaZ: 0, @@ -2840,15 +2845,17 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.floor(gHorizontalLine * 0.6) }, vertical: { expected: true, preventDefault: false, detail: Math.floor(gLineHeight * 0.4) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, }, { description: "lineOrPageDelta should be recomputed by ESM (line, negative) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 200); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", -100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 200], + ["mousewheel.default.delta_multiplier_y", -100]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_LINE, deltaX: -0.3, deltaY: -0.4, deltaZ: 0, @@ -2900,15 +2907,17 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.ceil(gHorizontalLine * -0.6) }, vertical: { expected: true, preventDefault: false, detail: Math.floor(gLineHeight * 0.4) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, }, { description: "lineOrPageDelta should be recomputed by ESM (page) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 200); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 200]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_PAGE, deltaX: 0.3, deltaY: 0.4, deltaZ: 0, @@ -2960,15 +2969,17 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.floor(gPageWidth * 0.4) }, vertical: { expected: true, preventDefault: false, detail: Math.floor(gPageHeight * 0.8) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, }, { description: "lineOrPageDelta should be recomputed by ESM (page, negative) #1", prepare: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 200); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 200]]}, + continueTest); }, event: { deltaMode: WheelEvent.DOM_DELTA_PAGE, deltaX: -0.3, deltaY: -0.4, deltaZ: 0, @@ -3020,8 +3031,9 @@ function testContinuousTrustedEvents() horizontal: { expected: true, preventDefault: false, detail: Math.ceil(gPageWidth * -0.4) }, vertical: { expected: true, preventDefault: false, detail: Math.ceil(gPageHeight * -0.8) } }, finished: function () { - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_x", 100); - SpecialPowers.setIntPref("mousewheel.default.delta_multiplier_y", 100); + SpecialPowers.pushPrefEnv({"set": [["mousewheel.default.delta_multiplier_x", 100], + ["mousewheel.default.delta_multiplier_y", 100]]}, + continueTest); }, }, ]; @@ -3151,13 +3163,13 @@ function testContinuousTrustedEvents() currentWheelEventTest = kSynthesizedWheelEventTests[i]; if (currentWheelEventTest.prepare) { - currentWheelEventTest.prepare(); + yield currentWheelEventTest.prepare(); } synthesizeWheel(gScrollableElement, 10, 10, currentWheelEventTest.event); if (currentWheelEventTest.finished) { - currentWheelEventTest.finished(); + yield currentWheelEventTest.finished(); } var description = "testContinuousTrustedEvents, " + @@ -3203,7 +3215,7 @@ function continueTest() function* testBody() { yield* prepareScrollUnits(); - testContinuousTrustedEvents(); + yield* testContinuousTrustedEvents(); } function runTests()