author | Alexandre Poirot <poirot.alex@gmail.com> |
Thu, 13 Aug 2015 10:57:15 -0700 | |
changeset 257694 | dffe88885c1b558cb42b28a97e8870d0a92393d8 |
parent 257693 | f9bb2b20c24ecc26e0e9d17f4ab3dcf4aac51504 |
child 257695 | b7b1caeba71d7cad97db4dc5a86afb3b9cf94406 |
push id | 29225 |
push user | kwierso@gmail.com |
push date | Thu, 13 Aug 2015 23:31:33 +0000 |
treeherder | mozilla-central@4e883591bb5d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jryans |
bugs | 1193313 |
milestone | 43.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
|
--- a/browser/devtools/framework/sidebar.js +++ b/browser/devtools/framework/sidebar.js @@ -5,17 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const {Cu} = require("chrome"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); -var {Promise: promise} = require("resource://gre/modules/Promise.jsm"); var EventEmitter = require("devtools/toolkit/event-emitter"); var Telemetry = require("devtools/shared/telemetry"); const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /** * ToolSidebar provides methods to register tabs in the sidebar. * It's assumed that the sidebar contains a xul:tabbox.
--- a/browser/devtools/projecteditor/lib/helpers/promise.js +++ b/browser/devtools/projecteditor/lib/helpers/promise.js @@ -3,9 +3,9 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /** * This helper is a quick way to require() the Promise object from Promise.jsm. */ const { Cu } = require("chrome"); -module.exports = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise; +module.exports = require("promise");
--- a/browser/devtools/shared/doorhanger.js +++ b/browser/devtools/shared/doorhanger.js @@ -3,17 +3,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const { Ci, Cc } = require("chrome"); const { Services } = require("resource://gre/modules/Services.jsm"); const { DOMHelpers } = require("resource:///modules/devtools/DOMHelpers.jsm"); const { Task } = require("resource://gre/modules/Task.jsm"); -const { Promise } = require("resource://gre/modules/Promise.jsm"); +const { Promise } = require("promise"); const { setTimeout } = require("sdk/timers"); const { getMostRecentBrowserWindow } = require("sdk/window/utils"); const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; const DEV_EDITION_PROMO_URL = "chrome://browser/content/devtools/framework/dev-edition-promo.xul"; const DEV_EDITION_PROMO_ENABLED_PREF = "devtools.devedition.promo.enabled"; const DEV_EDITION_PROMO_SHOWN_PREF = "devtools.devedition.promo.shown"; const DEV_EDITION_PROMO_URL_PREF = "devtools.devedition.promo.url";
--- a/browser/devtools/shared/test/browser_flame-graph-01.js +++ b/browser/devtools/shared/test/browser_flame-graph-01.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that flame graph widget works properly. let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_flame-graph-02.js +++ b/browser/devtools/shared/test/browser_flame-graph-02.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that flame graph widgets may have a fixed width or height. let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_flame-graph-03a.js +++ b/browser/devtools/shared/test/browser_flame-graph-03a.js @@ -4,17 +4,16 @@ // Tests that selections in the flame graph widget work properly. let TEST_DATA = [{ color: "#f00", blocks: [{ x: 0, y: 0, width: 50, height: 20, text: "FOO" }, { x: 50, y: 0, width: 100, height: 20, text: "BAR" }] }, { color: "#00f", blocks: [{ x: 0, y: 30, width: 30, height: 20, text: "BAZ" }] }]; let TEST_BOUNDS = { startTime: 0, endTime: 150 }; let TEST_WIDTH = 200; let TEST_HEIGHT = 100; let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_flame-graph-03b.js +++ b/browser/devtools/shared/test/browser_flame-graph-03b.js @@ -5,17 +5,16 @@ let TEST_DATA = [{ color: "#f00", blocks: [{ x: 0, y: 0, width: 50, height: 20, text: "FOO" }, { x: 50, y: 0, width: 100, height: 20, text: "BAR" }] }, { color: "#00f", blocks: [{ x: 0, y: 30, width: 30, height: 20, text: "BAZ" }] }]; let TEST_BOUNDS = { startTime: 0, endTime: 150 }; let TEST_WIDTH = 200; let TEST_HEIGHT = 100; let TEST_DPI_DENSITIY = 2; let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_flame-graph-03c.js +++ b/browser/devtools/shared/test/browser_flame-graph-03c.js @@ -5,17 +5,16 @@ let TEST_DATA = [{ color: "#f00", blocks: [{ x: 0, y: 0, width: 50, height: 20, text: "FOO" }, { x: 50, y: 0, width: 100, height: 20, text: "BAR" }] }, { color: "#00f", blocks: [{ x: 0, y: 30, width: 30, height: 20, text: "BAZ" }] }]; let TEST_BOUNDS = { startTime: 0, endTime: 150 }; let TEST_WIDTH = 200; let TEST_HEIGHT = 100; let TEST_DPI_DENSITIY = 2; let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_flame-graph-04.js +++ b/browser/devtools/shared/test/browser_flame-graph-04.js @@ -3,17 +3,16 @@ // Tests that text metrics in the flame graph widget work properly. let HTML_NS = "http://www.w3.org/1999/xhtml"; let {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {}); let {FlameGraph} = require("devtools/shared/widgets/FlameGraph"); let {FLAME_GRAPH_BLOCK_TEXT_FONT_SIZE} = require("devtools/shared/widgets/FlameGraph"); let {FLAME_GRAPH_BLOCK_TEXT_FONT_FAMILY} = require("devtools/shared/widgets/FlameGraph"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); let L10N = new ViewHelpers.L10N(); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); });
--- a/browser/devtools/shared/test/browser_graphs-01.js +++ b/browser/devtools/shared/test/browser_graphs-01.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets works properly. let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); finish(); });
--- a/browser/devtools/shared/test/browser_graphs-02.js +++ b/browser/devtools/shared/test/browser_graphs-02.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets can properly add data, regions and highlights. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-03.js +++ b/browser/devtools/shared/test/browser_graphs-03.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets can handle clients getting/setting the // selection or cursor. let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-04.js +++ b/browser/devtools/shared/test/browser_graphs-04.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets can correctly compare selections and cursors. let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-05.js +++ b/browser/devtools/shared/test/browser_graphs-05.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets can correctly determine which regions are hovered. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-06.js +++ b/browser/devtools/shared/test/browser_graphs-06.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests if clicking on regions adds a selection spanning that region. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-07a.js +++ b/browser/devtools/shared/test/browser_graphs-07a.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests if selecting, resizing, moving selections and zooming in/out works. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-07b.js +++ b/browser/devtools/shared/test/browser_graphs-07b.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests if selections can't be added via clicking, while not allowed. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-07c.js +++ b/browser/devtools/shared/test/browser_graphs-07c.js @@ -2,17 +2,16 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests if movement via event dispatching using screenX / screenY // works. All of the other tests directly use the graph's mouse event // callbacks with textX / testY for convenience. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-07d.js +++ b/browser/devtools/shared/test/browser_graphs-07d.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that selections are drawn onto the canvas. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; const TEST_REGIONS = [{ start: 320, end: 460 }, { start: 780, end: 860 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-07e.js +++ b/browser/devtools/shared/test/browser_graphs-07e.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that selections are drawn onto the canvas. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); let CURRENT_ZOOM = 1; add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); });
--- a/browser/devtools/shared/test/browser_graphs-08.js +++ b/browser/devtools/shared/test/browser_graphs-08.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests if a selection is dropped when clicking outside of it. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09a.js +++ b/browser/devtools/shared/test/browser_graphs-09a.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that line graphs properly create the gutter and tooltips. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09b.js +++ b/browser/devtools/shared/test/browser_graphs-09b.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that line graphs properly use the tooltips configuration properties. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09c.js +++ b/browser/devtools/shared/test/browser_graphs-09c.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that line graphs hide the tooltips when there's no data available. const TEST_DATA = []; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09d.js +++ b/browser/devtools/shared/test/browser_graphs-09d.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that line graphs hide the 'max' tooltip when the distance between // the 'min' and 'max' tooltip is too small. const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 59.9 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09e.js +++ b/browser/devtools/shared/test/browser_graphs-09e.js @@ -3,17 +3,16 @@ // Tests that line graphs hide the gutter and tooltips when there's no data, // but show them when there is. const NO_DATA = []; const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-09f.js +++ b/browser/devtools/shared/test/browser_graphs-09f.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests the constructor options for `min`, `max` and `avg` on displaying the // gutter/tooltips and lines. const TEST_DATA = [{ delta: 100, value: 60 }, { delta: 200, value: 1 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-10a.js +++ b/browser/devtools/shared/test/browser_graphs-10a.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graphs properly handle resizing. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-10b.js +++ b/browser/devtools/shared/test/browser_graphs-10b.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graphs aren't refreshed when the owner window resizes but // the graph dimensions stay the same. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-10c.js +++ b/browser/devtools/shared/test/browser_graphs-10c.js @@ -1,14 +1,13 @@ // Tests that graphs properly handle resizing. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-11a.js +++ b/browser/devtools/shared/test/browser_graphs-11a.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that bar graph create a legend as expected. let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); const CATEGORIES = [ { color: "#46afe3", label: "Foo" }, { color: "#eb5368", label: "Bar" }, { color: "#70bf53", label: "Baz" } ]; add_task(function*() {
--- a/browser/devtools/shared/test/browser_graphs-11b.js +++ b/browser/devtools/shared/test/browser_graphs-11b.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that bar graph's legend items handle mouseover/mouseout. let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); const CATEGORIES = [ { color: "#46afe3", label: "Foo" }, { color: "#eb5368", label: "Bar" }, { color: "#70bf53", label: "Baz" } ]; add_task(function*() {
--- a/browser/devtools/shared/test/browser_graphs-12.js +++ b/browser/devtools/shared/test/browser_graphs-12.js @@ -1,17 +1,16 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that canvas graphs can have their selection linked. let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); let BarGraphWidget = require("devtools/shared/widgets/BarGraphWidget"); let {CanvasGraphUtils} = require("devtools/shared/widgets/Graphs"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-13.js +++ b/browser/devtools/shared/test/browser_graphs-13.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets may have a fixed width or height. let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-14.js +++ b/browser/devtools/shared/test/browser_graphs-14.js @@ -1,16 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that graph widgets correctly emit mouse input events. const TEST_DATA = [{ delta: 112, value: 48 }, { delta: 213, value: 59 }, { delta: 313, value: 60 }, { delta: 413, value: 59 }, { delta: 530, value: 59 }, { delta: 646, value: 58 }, { delta: 747, value: 60 }, { delta: 863, value: 48 }, { delta: 980, value: 37 }, { delta: 1097, value: 30 }, { delta: 1213, value: 29 }, { delta: 1330, value: 23 }, { delta: 1430, value: 10 }, { delta: 1534, value: 17 }, { delta: 1645, value: 20 }, { delta: 1746, value: 22 }, { delta: 1846, value: 39 }, { delta: 1963, value: 26 }, { delta: 2080, value: 27 }, { delta: 2197, value: 35 }, { delta: 2312, value: 47 }, { delta: 2412, value: 53 }, { delta: 2514, value: 60 }, { delta: 2630, value: 37 }, { delta: 2730, value: 36 }, { delta: 2830, value: 37 }, { delta: 2946, value: 36 }, { delta: 3046, value: 40 }, { delta: 3163, value: 47 }, { delta: 3280, value: 41 }, { delta: 3380, value: 35 }, { delta: 3480, value: 27 }, { delta: 3580, value: 39 }, { delta: 3680, value: 42 }, { delta: 3780, value: 49 }, { delta: 3880, value: 55 }, { delta: 3980, value: 60 }, { delta: 4080, value: 60 }, { delta: 4180, value: 60 }]; let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-15.js +++ b/browser/devtools/shared/test/browser_graphs-15.js @@ -16,17 +16,16 @@ for (let frameRate of FRAMES) { for (let i = 0; i < frameRate; i++) { let delta = Math.floor(1000 / frameRate); // Duration between frames at this rate t += delta; TEST_DATA.push(t); } } let LineGraphWidget = require("devtools/shared/widgets/LineGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); add_task(function*() { yield promiseTab("about:blank"); yield performTest(); gBrowser.removeCurrentTab(); }); function* performTest() {
--- a/browser/devtools/shared/test/browser_graphs-16.js +++ b/browser/devtools/shared/test/browser_graphs-16.js @@ -1,15 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ // Tests that mounta graphs work as expected. let MountainGraphWidget = require("devtools/shared/widgets/MountainGraphWidget"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); const TEST_DATA = [ { delta: 0, values: [0.1, 0.5, 0.3] }, { delta: 1, values: [0.25, 0, 0.5] }, { delta: 2, values: [0.5, 0.25, 0.1] }, { delta: 3, values: [0, 0.75, 0] }, { delta: 4, values: [0.75, 0, 0.25] } ];
--- a/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js +++ b/browser/devtools/shared/test/browser_tableWidget_keyboard_interaction.js @@ -9,17 +9,16 @@ const TEST_URI = "data:text/xml;charset= "<?xml-stylesheet href='chrome://browser/skin/devtools/common.css'?>" + "<?xml-stylesheet href='chrome://browser/skin/devtools/widgets.css'?>" + "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" + " title='Table Widget' width='600' height='500'><box flex='1'/></window>"; const TEST_OPT = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no"; const {TableWidget} = require("devtools/shared/widgets/TableWidget"); let {Task} = require("resource://gre/modules/Task.jsm"); -let {Promise} = require("resource://gre/modules/Promise.jsm"); let doc, table; function test() { waitForExplicitFinish(); let win = Services.ww.openWindow(null, TEST_URI, "_blank", TEST_OPT, null); win.addEventListener("load", function onLoad() {
--- a/browser/devtools/sourceeditor/css-autocompleter.js +++ b/browser/devtools/sourceeditor/css-autocompleter.js @@ -1,16 +1,15 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const { Cc, Ci, Cu } = require('chrome'); const {cssTokenizer, cssTokenizerWithLineColumn} = require("devtools/sourceeditor/css-tokenizer"); -const promise = Cu.import("resource://gre/modules/Promise.jsm"); /** * Here is what this file (+ ./css-tokenizer.js) do. * * The main objective here is to provide as much suggestions to the user editing * a stylesheet in Style Editor. The possible things that can be suggested are: * - CSS property names * - CSS property values
--- a/browser/devtools/webide/modules/config-view.js +++ b/browser/devtools/webide/modules/config-view.js @@ -1,15 +1,14 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const {Cu} = require("chrome"); -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm"); const EventEmitter = require("devtools/toolkit/event-emitter"); const {Services} = Cu.import("resource://gre/modules/Services.jsm"); const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); let ConfigView; module.exports = ConfigView = function(window) { EventEmitter.decorate(this);
--- a/browser/devtools/webide/modules/runtime-list.js +++ b/browser/devtools/webide/modules/runtime-list.js @@ -2,17 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const {Cu} = require("chrome"); const {Services} = Cu.import("resource://gre/modules/Services.jsm"); const {AppProjects} = require("devtools/app-manager/app-projects"); const {AppManager} = require("devtools/webide/app-manager"); -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const EventEmitter = require("devtools/toolkit/event-emitter"); const {RuntimeScanners, WiFiScanner} = require("devtools/webide/runtimes"); const {Devices} = Cu.import("resource://gre/modules/devtools/Devices.jsm"); const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); const utils = require("devtools/webide/utils"); const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties");
--- a/toolkit/devtools/content-observer.js +++ b/toolkit/devtools/content-observer.js @@ -2,17 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const {Cc, Ci, Cu, Cr} = require("chrome"); const {Services} = Cu.import("resource://gre/modules/Services.jsm", {}); const events = require("sdk/event/core"); -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); /** * Handles adding an observer for the creation of content document globals, * event sent immediately after a web content document window has been set up, * but before any script code has been executed. */ function ContentObserver(tabActor) { this._contentWindow = tabActor.window;
--- a/toolkit/devtools/gcli/commands/addon.js +++ b/toolkit/devtools/gcli/commands/addon.js @@ -26,17 +26,16 @@ function getAddonManager() { addonManagerActive: false }; } } const { Cc, Ci, Cu } = require("chrome"); const { AddonManager, addonManagerActive } = getAddonManager(); const l10n = require("gcli/l10n"); -const { Promise: promise } = require("resource://gre/modules/Promise.jsm"); const BRAND_SHORT_NAME = Cc["@mozilla.org/intl/stringbundle;1"] .getService(Ci.nsIStringBundleService) .createBundle("chrome://branding/locale/brand.properties") .GetStringFromName("brandShortName"); /** * Takes a function that uses a callback as its last parameter, and returns a
--- a/toolkit/devtools/gcli/commands/csscoverage.js +++ b/toolkit/devtools/gcli/commands/csscoverage.js @@ -3,18 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const { Cc, Ci } = require("chrome"); loader.lazyGetter(this, "gDevTools", () => require("resource:///modules/devtools/gDevTools.jsm").gDevTools); -const promise = require("resource://gre/modules/Promise.jsm").Promise; - const domtemplate = require("gcli/util/domtemplate"); const csscoverage = require("devtools/server/actors/csscoverage"); const l10n = csscoverage.l10n; const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "Chart", "resource:///modules/devtools/Chart.jsm");
--- a/toolkit/devtools/gcli/source/lib/gcli/util/promise.js +++ b/toolkit/devtools/gcli/source/lib/gcli/util/promise.js @@ -11,9 +11,9 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ 'use strict'; -exports.Promise = require("resource://gre/modules/Promise.jsm").Promise; +exports.Promise = require("promise");
--- a/toolkit/devtools/server/actors/actor-registry.js +++ b/toolkit/devtools/server/actors/actor-registry.js @@ -3,17 +3,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const protocol = require("devtools/server/protocol"); const { method, custom, Arg, Option, RetVal } = protocol; const { Cu, CC, components } = require("chrome"); -const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); const Services = require("Services"); const { DebuggerServer } = require("devtools/server/main"); const { registerActor, unregisterActor } = require("devtools/server/actors/utils/actor-registry-utils"); loader.lazyImporter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm"); /** * The ActorActor gives you a handle to an actor you've dynamically
--- a/toolkit/devtools/server/actors/call-watcher.js +++ b/toolkit/devtools/server/actors/call-watcher.js @@ -1,16 +1,15 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const {Cc, Ci, Cu, Cr} = require("chrome"); const events = require("sdk/event/core"); -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); const protocol = require("devtools/server/protocol"); const {serializeStack, parseStack} = require("toolkit/loader"); const {on, once, off, emit} = events; const {method, Arg, Option, RetVal} = protocol; /** * Type describing a single function call in a stack trace.
--- a/toolkit/devtools/server/actors/preference.js +++ b/toolkit/devtools/server/actors/preference.js @@ -1,16 +1,15 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const {Cc, Ci, Cu, CC} = require("chrome"); const protocol = require("devtools/server/protocol"); const {Arg, method, RetVal} = protocol; -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); Cu.import("resource://gre/modules/Services.jsm"); exports.register = function(handle) { handle.addGlobalActor(PreferenceActor, "preferenceActor"); }; exports.unregister = function(handle) {
--- a/toolkit/devtools/server/actors/webaudio.js +++ b/toolkit/devtools/server/actors/webaudio.js @@ -2,17 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; const {Cc, Ci, Cu, Cr} = require("chrome"); const Services = require("Services"); -const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); const events = require("sdk/event/core"); const { on: systemOn, off: systemOff } = require("sdk/system/events"); const protocol = require("devtools/server/protocol"); const { CallWatcherActor, CallWatcherFront } = require("devtools/server/actors/call-watcher"); const { createValueGrip } = require("devtools/server/actors/object"); const AutomationTimeline = require("./utils/automation-timeline"); const { on, once, off, emit } = events; const { types, method, Arg, Option, RetVal } = protocol;
--- a/toolkit/devtools/server/tests/mochitest/inspector-helpers.js +++ b/toolkit/devtools/server/tests/mochitest/inspector-helpers.js @@ -1,16 +1,17 @@ var Cu = Components.utils; const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); const {DebuggerClient} = require("devtools/toolkit/client/main"); const {DebuggerServer} = require("devtools/server/main"); Cu.import("resource://gre/modules/Task.jsm"); const Services = require("Services"); +const promise = require("promise"); const {_documentWalker} = require("devtools/server/actors/inspector"); // Always log packets when running tests. Services.prefs.setBoolPref("devtools.debugger.log", true); SimpleTest.registerCleanupFunction(function() { Services.prefs.clearUserPref("devtools.debugger.log"); });
--- a/toolkit/devtools/server/tests/mochitest/test_css-logic.html +++ b/toolkit/devtools/server/tests/mochitest/test_css-logic.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {}); - const {CssLogic} = require("devtools/styleinspector/css-logic"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } addTest(function findAllCssSelectors() {
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-anonymous.html @@ -8,18 +8,16 @@ https://bugzilla.mozilla.org/show_bug.cg <title>Test for Bug 777674</title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> window.onload = function() { const Ci = Components.interfaces; - const {Promise: promise} = - Components.utils.import("resource://gre/modules/Promise.jsm", {}); const {InspectorFront} = require("devtools/server/actors/inspector"); const {_documentWalker} = require("devtools/server/actors/inspector"); const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; Services.prefs.setBoolPref("dom.webcomponents.enabled", true); SimpleTest.waitForExplicitFinish();
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-changeattrs.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-changevalue.html @@ -6,17 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); const Ci = Components.interfaces; const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); }
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-dead-nodes.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug 1121528</title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker, gDoc;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-hide.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-insert.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-attr.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-childlist.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-frameload.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-mutations-value.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } const testSummaryLength = 10;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-pseudoclass-lock.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); const DOMUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"]. getService(Components.interfaces.inIDOMUtils); const KNOWN_PSEUDOCLASSES = [':hover', ':active', ':focus'] window.onload = function() { SimpleTest.waitForExplicitFinish();
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-release.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-release.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-reload.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-remove.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-resolve-url.html @@ -6,17 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug 921102</title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspector;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-retain.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-scroll-into-view.html @@ -6,17 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug 901250</title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector-traversal.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gInspectee = null;
--- a/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html +++ b/toolkit/devtools/server/tests/mochitest/test_inspector_getImageData.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug 932937</title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_styles-applied.html +++ b/toolkit/devtools/server/tests/mochitest/test_styles-applied.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_styles-computed.html +++ b/toolkit/devtools/server/tests/mochitest/test_styles-computed.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_styles-matched.html +++ b/toolkit/devtools/server/tests/mochitest/test_styles-matched.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); const {CssLogic} = require("devtools/styleinspector/css-logic"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); }
--- a/toolkit/devtools/server/tests/mochitest/test_styles-modify.html +++ b/toolkit/devtools/server/tests/mochitest/test_styles-modify.html @@ -6,18 +6,16 @@ https://bugzilla.mozilla.org/show_bug.cg <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/server/tests/mochitest/test_styles-svg.html +++ b/toolkit/devtools/server/tests/mochitest/test_styles-svg.html @@ -7,18 +7,16 @@ Bug 921191 - allow inspection/editing of <head> <meta charset="utf-8"> <title>Test for Bug </title> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> <script type="application/javascript;version=1.8" src="inspector-helpers.js"></script> <script type="application/javascript;version=1.8"> -const {Promise: promise} = Components.utils.import("resource://gre/modules/Promise.jsm", {}); - const inspector = require("devtools/server/actors/inspector"); window.onload = function() { SimpleTest.waitForExplicitFinish(); runNextTest(); } var gWalker = null;
--- a/toolkit/devtools/tests/unit/test_async-utils.js +++ b/toolkit/devtools/tests/unit/test_async-utils.js @@ -4,17 +4,17 @@ // Test async-utils.js const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); // |const| will not work because // it will make the Promise object immutable before assigning. // Using Object.defineProperty() instead. Object.defineProperty(this, "Promise", { - value: Cu.import("resource://gre/modules/Promise.jsm", {}).Promise, + value: require("promise"), writable: false, configurable: false }); const {async, asyncOnce, promiseInvoke, promiseCall} = require("devtools/async-utils"); function run_test() { do_test_pending(); Task.spawn(function*() { for (let helper of [async, asyncOnce]) {