From 47e7c0e8d51c3efb086db0ba3cb0430f611272c9 Mon Sep 17 00:00:00 2001 From: Patrick Brosset Date: Mon, 25 May 2015 09:17:26 +0200 Subject: [PATCH 01/13] Bug 1167957 - Remove spidermonkey specific JS from debugger --HG-- extra : rebase_source : b67a5db0d154933dc8bde128ba7f5cbfdf6fc425 --- .../devtools/debugger/debugger-commands.js | 9 +++-- .../devtools/debugger/debugger-controller.js | 39 ++++++++++++++----- browser/devtools/debugger/debugger-view.js | 17 ++++---- browser/devtools/debugger/panel.js | 4 +- .../test/browser_dbg_addon-console.js | 2 +- .../browser_dbg_addon-modules-unpacked.js | 2 +- .../test/browser_dbg_addon-modules.js | 2 +- .../debugger/test/browser_dbg_addon-panels.js | 2 +- .../test/browser_dbg_addon-sources.js | 4 +- .../test/browser_dbg_breadcrumbs-access.js | 2 +- .../test/browser_dbg_break-on-dom-01.js | 2 +- .../test/browser_dbg_break-on-dom-02.js | 8 ++-- .../test/browser_dbg_break-on-dom-03.js | 2 +- .../test/browser_dbg_break-on-dom-04.js | 2 +- .../test/browser_dbg_break-on-dom-05.js | 2 +- .../test/browser_dbg_break-on-dom-06.js | 2 +- .../test/browser_dbg_break-on-dom-08.js | 2 +- ...browser_dbg_breakpoints-disabled-reload.js | 10 ++--- .../debugger/test/browser_dbg_cmd-blackbox.js | 2 +- .../debugger/test/browser_dbg_cmd-break.js | 2 +- .../debugger/test/browser_dbg_cmd-dbg.js | 2 +- .../browser_dbg_controller-evaluate-01.js | 2 +- .../browser_dbg_controller-evaluate-02.js | 2 +- .../debugger/test/browser_dbg_file-reload.js | 2 +- .../debugger/test/browser_dbg_host-layout.js | 6 +-- .../debugger/test/browser_dbg_listtabs-02.js | 16 ++++---- .../test/browser_dbg_pretty-print-05.js | 2 +- .../test/browser_dbg_pretty-print-06.js | 2 +- .../debugger/test/browser_dbg_stack-07.js | 2 +- ...rowser_dbg_variables-view-accessibility.js | 2 +- .../browser_dbg_variables-view-override-01.js | 2 +- .../browser_dbg_variables-view-override-02.js | 2 +- .../browser_dbg_variables-view-popup-01.js | 2 +- .../browser_dbg_variables-view-popup-02.js | 2 +- .../browser_dbg_variables-view-popup-03.js | 2 +- .../browser_dbg_variables-view-popup-04.js | 2 +- .../browser_dbg_variables-view-popup-05.js | 2 +- .../browser_dbg_variables-view-popup-06.js | 2 +- .../browser_dbg_variables-view-popup-07.js | 2 +- .../browser_dbg_variables-view-popup-08.js | 2 +- .../browser_dbg_variables-view-popup-09.js | 2 +- .../browser_dbg_variables-view-popup-10.js | 2 +- .../browser_dbg_variables-view-popup-11.js | 2 +- .../browser_dbg_variables-view-popup-12.js | 2 +- .../browser_dbg_variables-view-popup-13.js | 2 +- .../browser_dbg_variables-view-popup-15.js | 2 +- .../browser_dbg_variables-view-popup-16.js | 2 +- .../devtools/debugger/views/filter-view.js | 8 +++- .../debugger/views/global-search-view.js | 38 ++++++++++++------ .../debugger/views/watch-expressions-view.js | 4 +- 50 files changed, 143 insertions(+), 96 deletions(-) diff --git a/browser/devtools/debugger/debugger-commands.js b/browser/devtools/debugger/debugger-commands.js index a0459640384f..af4b8486173a 100644 --- a/browser/devtools/debugger/debugger-commands.js +++ b/browser/devtools/debugger/debugger-commands.js @@ -516,9 +516,12 @@ exports.items.push({ return args.invert ? !value : value; } - const toBlackBox = [s.attachment.source - for (s of dbg._view.Sources.items) - if (shouldBlackBox(s.attachment.source))]; + const toBlackBox = []; + for (let {attachment: {source}} of dbg._view.Sources.items) { + if (shouldBlackBox(source)) { + toBlackBox.push(source); + } + } // If we aren't black boxing any sources, bail out now. diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js index 314aeb70aef5..0b26a1c11c23 100644 --- a/browser/devtools/debugger/debugger-controller.js +++ b/browser/devtools/debugger/debugger-controller.js @@ -456,7 +456,9 @@ function ThreadState() { } ThreadState.prototype = { - get activeThread() DebuggerController.activeThread, + get activeThread() { + return DebuggerController.activeThread; + }, /** * Connect to the current thread client. @@ -542,7 +544,10 @@ function StackFrames() { } StackFrames.prototype = { - get activeThread() DebuggerController.activeThread, + get activeThread() { + return DebuggerController.activeThread; + }, + currentFrameDepth: -1, _currentFrameDescription: FRAME_TYPE.NORMAL, _syncedWatchExpressions: null, @@ -1114,8 +1119,14 @@ function SourceScripts() { } SourceScripts.prototype = { - get activeThread() DebuggerController.activeThread, - get debuggerClient() DebuggerController.client, + get activeThread() { + return DebuggerController.activeThread; + }, + + get debuggerClient() { + return DebuggerController.client; + }, + _cache: new Map(), /** @@ -2443,23 +2454,33 @@ DebuggerController.HitCounts = new HitCounts(); */ Object.defineProperties(window, { "gTarget": { - get: function() DebuggerController._target, + get: function() { + return DebuggerController._target; + }, configurable: true }, "gHostType": { - get: function() DebuggerView._hostType, + get: function() { + return DebuggerView._hostType; + }, configurable: true }, "gClient": { - get: function() DebuggerController.client, + get: function() { + return DebuggerController.client; + }, configurable: true }, "gThreadClient": { - get: function() DebuggerController.activeThread, + get: function() { + return DebuggerController.activeThread; + }, configurable: true }, "gCallStackPageSize": { - get: function() CALL_STACK_PAGE_SIZE, + get: function() { + return CALL_STACK_PAGE_SIZE; + }, configurable: true } }); diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js index 0f7703f95b3a..3e27dfb077f8 100644 --- a/browser/devtools/debugger/debugger-view.js +++ b/browser/devtools/debugger/debugger-view.js @@ -515,15 +515,17 @@ let DebuggerView = { * Gets the visibility state of the instruments pane. * @return boolean */ - get instrumentsPaneHidden() - this._instrumentsPane.hasAttribute("pane-collapsed"), + get instrumentsPaneHidden() { + return this._instrumentsPane.hasAttribute("pane-collapsed"); + }, /** * Gets the currently selected tab in the instruments pane. * @return string */ - get instrumentsPaneTab() - this._instrumentsPane.selectedTab.id, + get instrumentsPaneTab() { + return this._instrumentsPane.selectedTab.id; + }, /** * Sets the instruments pane hidden or visible. @@ -754,9 +756,10 @@ ResultsPanelContainer.prototype = Heritage.extend(WidgetMethods, { * Gets this container's visibility state. * @return boolean */ - get hidden() - this._panel.state == "closed" || - this._panel.state == "hiding", + get hidden() { + return this._panel.state == "closed" || + this._panel.state == "hiding"; + }, /** * Removes all items from this container and hides it. diff --git a/browser/devtools/debugger/panel.js b/browser/devtools/debugger/panel.js index 1411c3e416e2..a2d5e656bc04 100644 --- a/browser/devtools/debugger/panel.js +++ b/browser/devtools/debugger/panel.js @@ -68,7 +68,9 @@ DebuggerPanel.prototype = { // DevToolPanel API - get target() this._toolbox.target, + get target() { + return this._toolbox.target; + }, destroy: function() { // Make sure this panel is not already destroyed. diff --git a/browser/devtools/debugger/test/browser_dbg_addon-console.js b/browser/devtools/debugger/test/browser_dbg_addon-console.js index 3539e5e62d51..f658476d2e20 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-console.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-console.js @@ -18,7 +18,7 @@ function getCachedMessages(webConsole) { } function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js index 382f56c4a913..fb6813752e7d 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon5.xpi"; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon5/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules.js b/browser/devtools/debugger/test/browser_dbg_addon-modules.js index 1f4ae393d79c..90be4c6dbd71 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon4.xpi"; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon4/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-panels.js b/browser/devtools/debugger/test/browser_dbg_addon-panels.js index cd417f460b85..afc1e384b24d 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-panels.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-panels.js @@ -14,7 +14,7 @@ let PREFS = [ "devtools.netmonitor.enabled" ]; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-sources.js b/browser/devtools/debugger/test/browser_dbg_addon-sources.js index 89b4ebcbd864..f285e4fd37c9 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-sources.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-sources.js @@ -1,14 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Ensure that the sources listed when debugging an addon are either from the +// Ensure that the sources listed when debugging an addon are either from the // addon itself, or the SDK, with proper groups and labels. const ADDON_URL = EXAMPLE_URL + "addon3.xpi"; let gClient; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js index 40b8a5170a5f..40b37514feca 100644 --- a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js +++ b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js @@ -47,7 +47,7 @@ function test() { } function checkNavigationWhileFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { yield promise.all([ waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES), waitForSourceAndCaret(gPanel, "-01.js", 5), diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js index 86be67b0064e..6297162ff8d0 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js @@ -27,7 +27,7 @@ function test() { is(gView.instrumentsPaneTab, "variables-tab", "The variables tab should be selected by default."); - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); is(gEvents.itemCount, 0, "There should be no events before reloading."); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js index 3a5d127c9351..d0dedaa61d63 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); yield testFetchOnFocus(); yield testFetchOnReloadWhenFocused(); @@ -23,7 +23,7 @@ function test() { }); function testFetchOnFocus() { - return Task.spawn(function() { + return Task.spawn(function*() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); gView.toggleInstrumentsPane({ visible: true, animated: false }, 1); @@ -42,7 +42,7 @@ function test() { } function testFetchOnReloadWhenFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); let reloading = once(gDebugger.gTarget, "will-navigate"); @@ -73,7 +73,7 @@ function test() { } function testFetchOnReloadWhenNotFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { gDebugger.on(gDebugger.EVENTS.EVENT_LISTENERS_FETCHED, () => { ok(false, "Shouldn't have fetched any event listeners."); }); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js index bc8e62e94520..561d9df401bd 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js @@ -13,7 +13,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js index e68c9b0c2cac..fc49a01c4179 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js index 5356e5b2254b..d5a9b217583c 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js @@ -17,7 +17,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js index 38e5e3ee3d5b..9a24b0b75892 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js index ce92a9ac1d8f..10ed59bc3176 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); yield callInTab(gTab, "addBodyClickEventListener"); diff --git a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js index f9e49147534d..42a0aa618a4f 100644 --- a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js @@ -16,7 +16,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gBreakpoints = gDebugger.DebuggerController.Breakpoints; let gBreakpointLocation; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, "-01.js"); gBreakpointLocation = { actor: getSourceActor(gSources, EXAMPLE_URL + "code_script-switching-01.js"), line: 5 }; @@ -41,7 +41,7 @@ function test() { }); function verifyView({ disabled, visible }) { - return Task.spawn(function() { + return Task.spawn(function*() { // It takes a tick for the checkbox in the SideMenuWidget and the // gutter in the editor to get updated. yield waitForTick(); @@ -65,7 +65,7 @@ function test() { // before causing the debuggee to pause, to allow functions to yield first. function testWhenBreakpointEnabledAndFirstSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-01.js"); yield verifyView({ disabled: false, visible: true }); @@ -82,7 +82,7 @@ function test() { } function testWhenBreakpointEnabledAndSecondSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: false, visible: false }); @@ -97,7 +97,7 @@ function test() { } function testWhenBreakpointDisabledAndSecondSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: true, visible: false }); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js index 797efc1a499a..c40a9f10b8ea 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js @@ -16,7 +16,7 @@ function test() { return Task.spawn(spawnTest).then(finish, helpers.handleError); } -function spawnTest() { +function* spawnTest() { let options = yield helpers.openTab(TEST_URL); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-break.js b/browser/devtools/debugger/test/browser_dbg_cmd-break.js index 702c01059586..8e39fac36748 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-break.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-break.js @@ -18,7 +18,7 @@ function test() { }; helpers.addTabWithToolbar(TAB_URL, aOptions => { - return Task.spawn(function() { + return Task.spawn(function*() { yield helpers.audit(aOptions, [{ setup: 'break', check: { diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js index 7627acc4ef79..81fb43282b04 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js @@ -8,7 +8,7 @@ const TEST_URI = EXAMPLE_URL + "doc_cmd-dbg.html"; function test() { - return Task.spawn(function() { + return Task.spawn(function*() { let options = yield helpers.openTab(TEST_URI); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js index 41b98756caea..e1f7a8e2634c 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js index 441bac5414a2..d42060ca75ff 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_file-reload.js b/browser/devtools/debugger/test/browser_dbg_file-reload.js index 6b1bd1b041cc..4c57af75fa21 100644 --- a/browser/devtools/debugger/test/browser_dbg_file-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_file-reload.js @@ -15,7 +15,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, JS_URL); is(gSources.itemCount, 1, diff --git a/browser/devtools/debugger/test/browser_dbg_host-layout.js b/browser/devtools/debugger/test/browser_dbg_host-layout.js index 66b9c70bd849..e07998ff125c 100644 --- a/browser/devtools/debugger/test/browser_dbg_host-layout.js +++ b/browser/devtools/debugger/test/browser_dbg_host-layout.js @@ -9,7 +9,7 @@ let gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host"); function test() { - Task.spawn(function() { + Task.spawn(function*() { yield testHosts(["bottom", "side", "window"], ["horizontal", "vertical", "horizontal"]); yield testHosts(["side", "bottom", "side"], ["vertical", "horizontal", "vertical"]); yield testHosts(["bottom", "side", "bottom"], ["horizontal", "vertical", "horizontal"]); @@ -25,7 +25,7 @@ function testHosts(aHostTypes, aLayoutTypes) { Services.prefs.setCharPref("devtools.toolbox.host", firstHost); - return Task.spawn(function() { + return Task.spawn(function*() { let [tab, debuggee, panel] = yield initDebugger("about:blank"); yield testHost(tab, panel, firstHost, firstLayout); yield switchAndTestHost(tab, panel, secondHost, secondLayout); @@ -38,7 +38,7 @@ function switchAndTestHost(aTab, aPanel, aHostType, aLayoutType) { let gToolbox = aPanel._toolbox; let gDebugger = aPanel.panelWin; - return Task.spawn(function() { + return Task.spawn(function*() { let layoutChanged = once(gDebugger, gDebugger.EVENTS.LAYOUT_CHANGED); let hostChanged = gToolbox.switchHost(aHostType); diff --git a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js index d9878a70ab10..67eb79ff0a26 100644 --- a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js +++ b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js @@ -74,8 +74,8 @@ function testTabA() { is(tabActors.size, 2, "gTabA opened: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA opened: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA opened: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA opened: new tab title"); }); @@ -118,8 +118,8 @@ function testTabClosed() { is(tabActors.size, 2, "gTabA closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a!== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA closed: new tab title"); }); @@ -162,8 +162,8 @@ function testNewWindow() { is(tabActors.size, 3, "gTabC closed: three tabs in list"); ok(tabActors.has(gFirstActor), "gTabC closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabC closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabC closed: new tab title"); }); @@ -191,8 +191,8 @@ function testWindowClosed() { is(tabActors.size, 2, "gNewWindow closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gNewWindow closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gNewWindow closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gNewWindow closed: new tab title"); }); diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js index 382210645582..d3e4251e1494 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js @@ -19,7 +19,7 @@ function test() { gSources = gDebugger.DebuggerView.Sources; gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(gPanel, TAB_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js index 900f66bdf40d..9d7903df6952 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js @@ -35,7 +35,7 @@ function test() { }; }(gClient.request)); - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(gPanel, JS_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_stack-07.js b/browser/devtools/debugger/test/browser_dbg_stack-07.js index d17f958c5848..cb8099ae81a8 100644 --- a/browser/devtools/debugger/test/browser_dbg_stack-07.js +++ b/browser/devtools/debugger/test/browser_dbg_stack-07.js @@ -29,7 +29,7 @@ function test() { } function performTest() { - return Task.spawn(function() { + return Task.spawn(function*() { yield selectBottomFrame(); testBottomFrame(4); diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js index 7605b2ccab41..3256bbb319ce 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js @@ -62,7 +62,7 @@ function performTest() { gVariablesView.rawObject = test; gVariablesView.scrollPageSize = 5; - return Task.spawn(function() { + return Task.spawn(function*() { yield waitForTick(); // Part 0: Test generic focus methods on the variables view. diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js index 7b2911c38036..84391a08fe8e 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js index 641293d117c6..3750437e1733 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js index 030e4405b763..6ace1c609ad6 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js index 630ee0dbe191..363a3ad7f39f 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js index 4ed3375beed1..f3559debccc2 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js index 3d4a43bd1391..f485c8fbdbd4 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js index 846f063ec8e5..1f055c2b63e0 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js index 1855e1ba1c7b..3a70b33c2641 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { requestLongerTimeout(2); - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js index b432507328ca..0621f843d045 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js index 045356e54333..bb6a1b0a4934 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js index a06587775d70..7e5ffbee1820 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-3.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js index 0905a05512a0..943bbab27704 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js index 5fc86988eaeb..63cc5137ae5a 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js index f4b290ae8123..843ff2980206 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js index fad68f92aba1..a94ade081552 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_domnode-variables.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js index 1a9e40947c82..b9d838269368 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js index 2f822a14ea94..4b4e0407e1e0 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/views/filter-view.js b/browser/devtools/debugger/views/filter-view.js index 1cc41076302f..03f8cf963a6e 100644 --- a/browser/devtools/debugger/views/filter-view.js +++ b/browser/devtools/debugger/views/filter-view.js @@ -170,13 +170,17 @@ FilterView.prototype = { * Returns the current search operator. * @return string */ - get searchOperator() this.searchData[0], + get searchOperator() { + return this.searchData[0]; + }, /** * Returns the current search arguments. * @return array */ - get searchArguments() this.searchData[1], + get searchArguments() { + return this.searchData[1]; + }, /** * Clears the text from the searchbox and any changed views. diff --git a/browser/devtools/debugger/views/global-search-view.js b/browser/devtools/debugger/views/global-search-view.js index 4d96f16ffa96..9d4eaa3eadfe 100644 --- a/browser/devtools/debugger/views/global-search-view.js +++ b/browser/devtools/debugger/views/global-search-view.js @@ -50,9 +50,10 @@ GlobalSearchView.prototype = Heritage.extend(WidgetMethods, { * Gets the visibility state of the global search container. * @return boolean */ - get hidden() - this.widget.getAttribute("hidden") == "true" || - this._splitter.getAttribute("hidden") == "true", + get hidden() { + return this.widget.getAttribute("hidden") == "true" || + this._splitter.getAttribute("hidden") == "true"; + }, /** * Hides and removes all items from this search container. @@ -366,7 +367,9 @@ GlobalResults.prototype = { /** * Gets the number of source results in this store. */ - get matchCount() this._store.length + get matchCount() { + return this._store.length; + } }; /** @@ -400,7 +403,9 @@ SourceResults.prototype = { /** * Gets the number of line results in this store. */ - get matchCount() this._store.length, + get matchCount() { + return this._store.length; + }, /** * Expands the element, showing all the added details. @@ -429,21 +434,26 @@ SourceResults.prototype = { * Gets this element's expanded state. * @return boolean */ - get expanded() - this._resultsContainer.getAttribute("hidden") != "true" && - this._arrow.hasAttribute("open"), + get expanded() { + return this._resultsContainer.getAttribute("hidden") != "true" && + this._arrow.hasAttribute("open"); + }, /** * Sets this element's expanded state. * @param boolean aFlag */ - set expanded(aFlag) this[aFlag ? "expand" : "collapse"](), + set expanded(aFlag) { + this[aFlag ? "expand" : "collapse"](); + }, /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() this._target, + get target() { + return this._target; + }, /** * Customization function for creating this item's UI. @@ -547,13 +557,17 @@ LineResults.prototype = { /** * Gets the number of word results in this store. */ - get matchCount() this._matchCount, + get matchCount() { + return this._matchCount; + }, /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() this._target, + get target() { + return this._target; + }, /** * Customization function for creating this item's UI. diff --git a/browser/devtools/debugger/views/watch-expressions-view.js b/browser/devtools/debugger/views/watch-expressions-view.js index e3d942e90f19..c78ef4b830b2 100644 --- a/browser/devtools/debugger/views/watch-expressions-view.js +++ b/browser/devtools/debugger/views/watch-expressions-view.js @@ -107,7 +107,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ switchExpression: function(aVar, aExpression) { let expressionItem = - [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; + [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; // Remove the watch expression if it's going to be empty or a duplicate. if (!aExpression || this.getAllStrings().indexOf(aExpression) != -1) { @@ -133,7 +133,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ deleteExpression: function(aVar) { let expressionItem = - [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; + [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; // Remove the watch expression. this.remove(expressionItem); From b5cd5dd34f10c844cc1227ba0958bf475585b5ef Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Mon, 25 May 2015 01:09:47 +0200 Subject: [PATCH 02/13] Bug 1167181 - Wait for computed view to be fully loaded in tests before proceeding to next one. r=pbrosset --- browser/devtools/styleinspector/computed-view.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/browser/devtools/styleinspector/computed-view.js b/browser/devtools/styleinspector/computed-view.js index c43811ee6943..b73fdd84ecc6 100644 --- a/browser/devtools/styleinspector/computed-view.js +++ b/browser/devtools/styleinspector/computed-view.js @@ -1245,10 +1245,11 @@ PropertyView.prototype = { this._matchedSelectorResponse = matched; - this._buildMatchedSelectors(); + this._buildMatchedSelectors() + .then(() => { + this.tree.inspector.emit("computed-view-property-expanded"); + }); this.matchedExpander.setAttribute("open", ""); - - this.tree.inspector.emit("computed-view-property-expanded"); }).then(null, console.error); } else { this.matchedSelectorsContainer.innerHTML = ""; @@ -1264,6 +1265,7 @@ PropertyView.prototype = { }, _buildMatchedSelectors: function() { + let promises = []; let frag = this.element.ownerDocument.createDocumentFragment(); for (let selector of this.matchedSelectorViews) { @@ -1292,9 +1294,11 @@ PropertyView.prototype = { class: "other-property-value theme-fg-color1" }); valueSpan.appendChild(selector.outputFragment); + promises.push(selector.ready); } this.matchedSelectorsContainer.appendChild(frag); + return promise.all(promises); }, /** @@ -1391,7 +1395,7 @@ function SelectorView(aTree, aSelectorInfo) this.openStyleEditor = this.openStyleEditor.bind(this); this.maybeOpenStyleEditor = this.maybeOpenStyleEditor.bind(this); - this.updateSourceLink(); + this.ready = this.updateSourceLink(); } /** From d11b1283f6942ece04f8b0c324dc6620fdbf45a7 Mon Sep 17 00:00:00 2001 From: Tim Nguyen Date: Fri, 22 May 2015 09:58:00 -0400 Subject: [PATCH 03/13] Bug 1125952 - Make about:sessionrestore use more available height. r=jaws --- .../content/aboutSessionRestore.xhtml | 37 +++++++++---------- browser/themes/shared/aboutSessionRestore.css | 2 +- .../themes/shared/in-content/common.inc.css | 1 + .../shared/in-content/info-pages.inc.css | 22 +++++++++-- 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/browser/components/sessionstore/content/aboutSessionRestore.xhtml b/browser/components/sessionstore/content/aboutSessionRestore.xhtml index 4ac7e5bc252a..93837f02cccd 100644 --- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml +++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml @@ -15,7 +15,7 @@ %restorepageDTD; ]> - + &restorepage.tabtitle; @@ -27,7 +27,7 @@ -
+

&restorepage.errorTitle;

@@ -42,43 +42,42 @@
  • &restorepage.startNew;
    • - - +
    + - - - - - - - + + + + + + +
    - - +
    #ifdef XP_UNIX -
    diff --git a/browser/themes/shared/aboutSessionRestore.css b/browser/themes/shared/aboutSessionRestore.css index aed04ef4aefd..52488af404f3 100644 --- a/browser/themes/shared/aboutSessionRestore.css +++ b/browser/themes/shared/aboutSessionRestore.css @@ -35,4 +35,4 @@ treechildren::-moz-tree-image(partial) { } treechildren::-moz-tree-image(partial, selected) { list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted"); -} \ No newline at end of file +} diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index faec0952674b..06d86197ff17 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -704,6 +704,7 @@ xul|tree { -moz-appearance: none; font-size: 1em; border: 1px solid var(--in-content-box-border-color); + margin: 0; } xul|tree:-moz-focusring, diff --git a/toolkit/themes/shared/in-content/info-pages.inc.css b/toolkit/themes/shared/in-content/info-pages.inc.css index 1c8f8b255bb9..727b975c0795 100644 --- a/toolkit/themes/shared/in-content/info-pages.inc.css +++ b/toolkit/themes/shared/in-content/info-pages.inc.css @@ -2,6 +2,7 @@ /* Body and container */ body { display: flex; + flex-direction: column; box-sizing: padding-box; min-height: 100vh; padding-top: 0; @@ -17,6 +18,13 @@ body { max-width: 52em; } +.container.flex { + display: flex; + flex-direction: column; + flex-grow: 1; + margin: 10vh 0; +} + /* Typography */ .title { background-image: url("chrome://browser/skin/aboutNetError_info.svg"); @@ -82,8 +90,16 @@ ul { } /* Trees */ -tree { - min-height: 12em; +.tree-container { margin-top: 1.2em; + flex-grow: 1; + min-height: 12em; +} + +.tree-container > tree { + height: 100%; +} + +tree { width: 100%; -} \ No newline at end of file +} From f0a8818555bd9500d06e2296b7cd2f5494c02d5d Mon Sep 17 00:00:00 2001 From: David Rajchenbach-Teller Date: Tue, 19 May 2015 13:53:41 +0200 Subject: [PATCH 04/13] Bug 1034075 - Add more details to SessionFile AsyncShutdown blocker. r=ttaubert --HG-- extra : transplant_source : g%96%E37%1CI%07%DD%E2o%1B%BD%A8%F7%C7g-0%8D%CE --- browser/components/sessionstore/SessionFile.jsm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/browser/components/sessionstore/SessionFile.jsm b/browser/components/sessionstore/SessionFile.jsm index 4fb2e1653ce5..c31cb42e4a8e 100644 --- a/browser/components/sessionstore/SessionFile.jsm +++ b/browser/components/sessionstore/SessionFile.jsm @@ -173,6 +173,10 @@ let SessionFileInternal = { }, }), + // `true` once `write` has succeeded at last once. + // Used for error-reporting. + _hasWriteEverSucceeded: false, + // The ID of the latest version of Gecko for which we have an upgrade backup // or |undefined| if no upgrade backup was ever written. get latestUpgradeBackupID() { @@ -275,7 +279,7 @@ let SessionFileInternal = { promise = promise.then(msg => { // Record how long the write took. this._recordTelemetry(msg.telemetry); - + this._hasWriteEverSucceeded = true; if (msg.result.upgradeBackup) { // We have just completed a backup-on-upgrade, store the information // in preferences. @@ -293,7 +297,14 @@ let SessionFileInternal = { // Ensure that we can write sessionstore.js cleanly before the profile // becomes unaccessible. AsyncShutdown.profileBeforeChange.addBlocker( - "SessionFile: Finish writing Session Restore data", promise); + "SessionFile: Finish writing Session Restore data", + promise, + { + fetchState: () => ({ + options, + hasEverSucceeded: this._hasWriteEverSucceeded + }) + }); // This code will always be executed because |promise| can't fail anymore. // We ensured that by having a reject handler that reports the failure but From e750e5231fd476878458c69f3809fe8d2cf85e86 Mon Sep 17 00:00:00 2001 From: Ursula Date: Fri, 22 May 2015 11:52:44 -0400 Subject: [PATCH 05/13] Bug 1167594 - Make it possible for the preloaded browser to be remote. r=mconley --- browser/base/content/tabbrowser.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index a7ddc3ed4f8b..0c51ea559240 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -1570,7 +1570,12 @@ // Attach the nsIFormFillController now that we know the browser // will be used. If we do that before and the preloaded browser // won't be consumed until shutdown then we leak a docShell. - if (browser && this.hasAttribute("autocompletepopup")) { + // Also, we do not need to take care of attaching nsIFormFillControllers + // in the case that the browser is remote, as remote browsers take + // care of that themselves. + if (browser && + this.hasAttribute("autocompletepopup") && + !browser.isRemoteBrowser) { browser.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup")); browser.attachFormFill(); } @@ -1601,7 +1606,9 @@ return; } - let browser = this._createBrowser({isPreloadBrowser: true}); + let remote = gMultiProcessBrowser && + E10SUtils.canLoadURIInProcess(BROWSER_NEW_TAB_URL, Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT); + let browser = this._createBrowser({isPreloadBrowser: true, remote: remote}); this._preloadedBrowser = browser; let notificationbox = this.getNotificationBox(browser); From 74c077bdaeb4749fb13d341e149d9ed5316957fa Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 22 May 2015 09:34:00 -0400 Subject: [PATCH 06/13] Bug 1167633 - Remove SpiderMonkey specific JS syntax from App Manager / WebIDE. r=pbrosset --- browser/devtools/app-manager/content/projects.js | 2 +- browser/devtools/app-manager/test/browser_manifest_editor.js | 2 +- browser/devtools/webide/content/webide.js | 2 +- browser/devtools/webide/modules/app-manager.js | 2 +- browser/devtools/webide/modules/simulator-process.js | 4 +++- browser/devtools/webide/test/browser_tabs.js | 2 +- browser/devtools/webide/test/browser_widget.js | 2 +- browser/devtools/webide/test/sidebars/browser_tabs.js | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/browser/devtools/app-manager/content/projects.js b/browser/devtools/app-manager/content/projects.js index 0b88592fabc4..af22bb02685c 100644 --- a/browser/devtools/app-manager/content/projects.js +++ b/browser/devtools/app-manager/content/projects.js @@ -126,7 +126,7 @@ let UI = { _getLocalIconURL: function(project, manifest) { let icon; if (manifest.icons) { - let size = Object.keys(manifest.icons).sort(function(a, b) b - a)[0]; + let size = Object.keys(manifest.icons).sort((a, b) => b - a)[0]; if (size) { icon = manifest.icons[size]; } diff --git a/browser/devtools/app-manager/test/browser_manifest_editor.js b/browser/devtools/app-manager/test/browser_manifest_editor.js index 676eff6f108e..1dfc09a36cd2 100644 --- a/browser/devtools/app-manager/test/browser_manifest_editor.js +++ b/browser/devtools/app-manager/test/browser_manifest_editor.js @@ -11,7 +11,7 @@ let gManifestWindow, gManifestEditor; function test() { waitForExplicitFinish(); - Task.spawn(function() { + Task.spawn(function*() { Services.prefs.setBoolPref(MANIFEST_EDITOR_ENABLED, true); let tab = yield openAppManager(); yield selectProjectsPanel(); diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js index 739cbcfb2f4c..2dc4056fcbfb 100644 --- a/browser/devtools/webide/content/webide.js +++ b/browser/devtools/webide/content/webide.js @@ -190,7 +190,7 @@ let UI = { } break; case "project": - this._updatePromise = Task.spawn(function() { + this._updatePromise = Task.spawn(function*() { UI.updateTitle(); yield UI.destroyToolbox(); UI.updateCommands(); diff --git a/browser/devtools/webide/modules/app-manager.js b/browser/devtools/webide/modules/app-manager.js index 78fa1fd5f994..45653794de91 100644 --- a/browser/devtools/webide/modules/app-manager.js +++ b/browser/devtools/webide/modules/app-manager.js @@ -677,7 +677,7 @@ let AppManager = exports.AppManager = { let manifest = validation.manifest; let iconPath; if (manifest.icons) { - let size = Object.keys(manifest.icons).sort(function(a, b) b - a)[0]; + let size = Object.keys(manifest.icons).sort((a, b) => b - a)[0]; if (size) { iconPath = manifest.icons[size]; } diff --git a/browser/devtools/webide/modules/simulator-process.js b/browser/devtools/webide/modules/simulator-process.js index 1b20137b5359..50a7f53be87f 100644 --- a/browser/devtools/webide/modules/simulator-process.js +++ b/browser/devtools/webide/modules/simulator-process.js @@ -35,7 +35,9 @@ function SimulatorProcess() {} SimulatorProcess.prototype = { // Check if B2G is running. - get isRunning() !!this.process, + get isRunning() { + return !!this.process; + }, // Start the process and connect the debugger client. run() { diff --git a/browser/devtools/webide/test/browser_tabs.js b/browser/devtools/webide/test/browser_tabs.js index 6ec8d572b18a..ee306ac666e7 100644 --- a/browser/devtools/webide/test/browser_tabs.js +++ b/browser/devtools/webide/test/browser_tabs.js @@ -8,7 +8,7 @@ function test() { waitForExplicitFinish(); requestCompleteLog(); - Task.spawn(function() { + Task.spawn(function*() { const { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); diff --git a/browser/devtools/webide/test/browser_widget.js b/browser/devtools/webide/test/browser_widget.js index 574ec413bb84..e5d1057f7a38 100644 --- a/browser/devtools/webide/test/browser_widget.js +++ b/browser/devtools/webide/test/browser_widget.js @@ -4,7 +4,7 @@ function test() { waitForExplicitFinish(); - Task.spawn(function() { + Task.spawn(function*() { let win = yield openWebIDE(); ok(document.querySelector("#webide-button"), "Found WebIDE button"); Services.prefs.setBoolPref("devtools.webide.widget.enabled", false); diff --git a/browser/devtools/webide/test/sidebars/browser_tabs.js b/browser/devtools/webide/test/sidebars/browser_tabs.js index c80bd6686024..d4158d889e5c 100644 --- a/browser/devtools/webide/test/sidebars/browser_tabs.js +++ b/browser/devtools/webide/test/sidebars/browser_tabs.js @@ -8,7 +8,7 @@ function test() { waitForExplicitFinish(); requestCompleteLog(); - Task.spawn(function() { + Task.spawn(function*() { const { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {}); From a2bdf04cfde38c38277c4588059dd95fc759bc75 Mon Sep 17 00:00:00 2001 From: Ursula Date: Fri, 22 May 2015 15:52:43 -0400 Subject: [PATCH 07/13] Bug 1145303 - Remove unused 'What is this page?' link and related intro messaging. r=mconley --- browser/base/content/newtab/newTab.css | 45 ------------------- browser/base/content/newtab/newTab.xul | 7 --- .../test/newtab/browser_newtab_enhanced.js | 3 -- .../locales/en-US/chrome/browser/newTab.dtd | 2 - browser/themes/linux/newtab/newTab.css | 1 - browser/themes/osx/newtab/newTab.css | 1 - browser/themes/shared/newtab/newTab.inc.css | 1 - browser/themes/windows/newtab/newTab.css | 1 - 8 files changed, 61 deletions(-) diff --git a/browser/base/content/newtab/newTab.css b/browser/base/content/newtab/newTab.css index d14b403af7b8..f444290bc598 100644 --- a/browser/base/content/newtab/newTab.css +++ b/browser/base/content/newtab/newTab.css @@ -50,50 +50,6 @@ input[type=button] { right: auto; } -#newtab-intro-what { - cursor: pointer; - position: absolute; - right: 70px; - top: 20px; - display: none; -} - -#newtab-intro-what:-moz-locale-dir(rtl) { - left: 70px; - right: auto; -} - -#newtab-scrollbox[page-disabled] #newtab-intro-what { - display: none; -} - -#newtab-intro-panel { - color: #6a7b86; - font-size: 15px; - line-height: 19px; - width: 520px; -} - -#newtab-intro-panel h1 { - color: #343f48; - font-family: Open Sans, sans-serif; - font-size: 30px; - margin: 20px; -} - -#newtab-intro-panel p { - margin: 10px 20px; -} - -#newtab-intro-panel p:last-child { - margin-bottom: 30px; -} - -#newtab-intro-what:hover, -#newtab-intro-panel a { - color: #4a90e2; -} - /* MARGINS */ #newtab-vertical-margin { display: -moz-box; @@ -299,7 +255,6 @@ input[type=button] { text-align: start; } -#newtab-intro-panel input, .sponsored-explain input, .suggested-explain input { background-size: 18px; diff --git a/browser/base/content/newtab/newTab.xul b/browser/base/content/newtab/newTab.xul index 0c2aae495798..913c515c0107 100644 --- a/browser/base/content/newtab/newTab.xul +++ b/browser/base/content/newtab/newTab.xul @@ -24,11 +24,6 @@
    - -
    -
    &newtab.customize.what;
    - diff --git a/browser/base/content/test/newtab/browser_newtab_enhanced.js b/browser/base/content/test/newtab/browser_newtab_enhanced.js index ddd5454ff551..02176a6b9ac3 100644 --- a/browser/base/content/test/newtab/browser_newtab_enhanced.js +++ b/browser/base/content/test/newtab/browser_newtab_enhanced.js @@ -109,9 +109,6 @@ function runTests() { is(getData(1), null, "directory link still pushed out by pinned history link"); - ok(getContentDocument().getElementById("newtab-intro-what"), - "'What is this page?' link exists"); - yield unpinCell(0); diff --git a/browser/locales/en-US/chrome/browser/newTab.dtd b/browser/locales/en-US/chrome/browser/newTab.dtd index fbe974f2d21a..ad7188fa1233 100644 --- a/browser/locales/en-US/chrome/browser/newTab.dtd +++ b/browser/locales/en-US/chrome/browser/newTab.dtd @@ -12,8 +12,6 @@ - - diff --git a/browser/themes/linux/newtab/newTab.css b/browser/themes/linux/newtab/newTab.css index 48e1a6aa3363..371594f069e8 100644 --- a/browser/themes/linux/newtab/newTab.css +++ b/browser/themes/linux/newtab/newTab.css @@ -14,7 +14,6 @@ width: 16px; } -#newtab-intro-panel, .newtab-title { font-family: sans-serif; } diff --git a/browser/themes/osx/newtab/newTab.css b/browser/themes/osx/newtab/newTab.css index a18bf6bbb870..0a5bace75c85 100644 --- a/browser/themes/osx/newtab/newTab.css +++ b/browser/themes/osx/newtab/newTab.css @@ -9,7 +9,6 @@ color: rgb(20,79,174); } -#newtab-intro-panel, .newtab-title { font-family: Lucida Grande; } diff --git a/browser/themes/shared/newtab/newTab.inc.css b/browser/themes/shared/newtab/newTab.inc.css index 18872ed13a2c..978332ba0e9f 100644 --- a/browser/themes/shared/newtab/newTab.inc.css +++ b/browser/themes/shared/newtab/newTab.inc.css @@ -155,7 +155,6 @@ } /* TITLES */ -#newtab-intro-what, .newtab-sponsored, .newtab-title, .newtab-suggested { diff --git a/browser/themes/windows/newtab/newTab.css b/browser/themes/windows/newtab/newTab.css index a119e0ff0aa7..592f64145910 100644 --- a/browser/themes/windows/newtab/newTab.css +++ b/browser/themes/windows/newtab/newTab.css @@ -13,7 +13,6 @@ padding: 0; } -#newtab-intro-panel, .newtab-title { font-family: Segoe UI; } From d2b470167d83cad225a12283b0da00796b647a89 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 19 May 2015 11:43:39 -0700 Subject: [PATCH 08/13] Bug 1152597 - Icons are shown for some apps. r=marco --- dom/apps/AppsUtils.jsm | 7 +++---- mobile/android/chrome/content/aboutApps.js | 2 +- toolkit/webapps/NativeApp.jsm | 10 ++++++++-- toolkit/webapps/tests/data/512.png | Bin 0 -> 5636 bytes toolkit/webapps/tests/test_hosted_icons.xul | 6 ++++++ toolkit/webapps/tests/test_packaged_icons.xul | 6 ++++++ 6 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 toolkit/webapps/tests/data/512.png diff --git a/dom/apps/AppsUtils.jsm b/dom/apps/AppsUtils.jsm index fd7d718e5f1f..f879e13e2f78 100644 --- a/dom/apps/AppsUtils.jsm +++ b/dom/apps/AppsUtils.jsm @@ -891,18 +891,17 @@ ManifestHelper.prototype = { return {}; }, - get biggestIconURL() { + biggestIconURL: function(predicate) { let icons = this._localeProp("icons"); if (!icons) { return null; } - let iconSizes = Object.keys(icons); + let iconSizes = Object.keys(icons).sort((a, b) => a - b) + .filter(predicate || (() => true)); if (iconSizes.length == 0) { return null; } - - iconSizes.sort((a, b) => a - b); let biggestIconSize = iconSizes.pop(); let biggestIcon = icons[biggestIconSize]; let biggestIconURL = this._baseURI.resolve(biggestIcon); diff --git a/mobile/android/chrome/content/aboutApps.js b/mobile/android/chrome/content/aboutApps.js index cceb27765034..defe88bdaa1e 100644 --- a/mobile/android/chrome/content/aboutApps.js +++ b/mobile/android/chrome/content/aboutApps.js @@ -114,7 +114,7 @@ function addApplication(aApp) { container.setAttribute("title", manifest.name); let img = document.createElement("img"); - img.src = manifest.biggestIconURL || DEFAULT_ICON; + img.src = manifest.biggestIconURL() || DEFAULT_ICON; img.onerror = function() { // If the image failed to load, and it was not our default icon, attempt to // use our default as a fallback. diff --git a/toolkit/webapps/NativeApp.jsm b/toolkit/webapps/NativeApp.jsm index 618cc47154c2..8de17947808c 100644 --- a/toolkit/webapps/NativeApp.jsm +++ b/toolkit/webapps/NativeApp.jsm @@ -103,8 +103,14 @@ CommonNativeApp.prototype = { let manifest = new ManifestHelper(aManifest, aApp.origin, aApp.manifestURL); let origin = Services.io.newURI(aApp.origin, null, null); - this.iconURI = Services.io.newURI(manifest.biggestIconURL || DEFAULT_ICON_URL, - null, null); +#ifdef XP_WIN + let biggestIconURL = manifest.biggestIconURL(v => v <= 256); +#else + let biggestIconURL = manifest.biggestIconURL(); +#endif + + this.iconURI = Services.io.newURI(biggestIconURL || DEFAULT_ICON_URL, null, + null); if (manifest.developer) { if (manifest.developer.name) { diff --git a/toolkit/webapps/tests/data/512.png b/toolkit/webapps/tests/data/512.png new file mode 100644 index 0000000000000000000000000000000000000000..ddb90d8b8fd296d0f46fff1bf364d55cec915dac GIT binary patch literal 5636 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Dage(c!@6@aFBup__j$TF zhEy=Vz2+#$puofIcwqnYLkW+!@ojpkTzya1y@7#|iG^bci=Woo4J;f23Jwhi#0?m1 zm_VWe99$9%2QRs*Ie=8LHOK>Hfec4RW`&4dC%~!?FnnMJGZZuu7+Ac;XM&BBV5ozb z%fiajknmDT7_5=`06)llhQ5bDIgmZ5*U7ftx^yWF<@v~+U*0@$irX{wu+^R ziOpd{$wW?&#s|hr<1RP-Cn5Jh0)@Z=+2W;o4V@E@FG|i4?u+h?Bw44FVdQ&MBb@0Qlf}hyVZp literal 0 HcmV?d00001 diff --git a/toolkit/webapps/tests/test_hosted_icons.xul b/toolkit/webapps/tests/test_hosted_icons.xul index 28b1b3ca41c3..a9a85e67ba01 100644 --- a/toolkit/webapps/tests/test_hosted_icons.xul +++ b/toolkit/webapps/tests/test_hosted_icons.xul @@ -57,6 +57,8 @@ let iconTests = [ {"32": generateDataURI(getFile(getTestFilePath("data/icon.png"))) }, // URI to a file that isn't an image {"32": "/chrome/toolkit/webapps/tests/data/app/index.html"}, + // Large icon that won't be used on Windows (bug #1152597) + {"512": "/chrome/toolkit/webapps/tests/data/512.png"}, ]; // This is an array of the icon sizes associated with the elements of @@ -79,6 +81,7 @@ if (LINUX) { [2787, 0], [2787, 0], [4009, 0], + [2195, 0], ]; } else if (WIN) { iconSizes = [ @@ -87,6 +90,8 @@ if (LINUX) { [4286, 0], [4286, 0], [16958, 0], + // Windows ICO doesn't support 512x512 icons. The default should be chosen. + [16958, 0], ]; } else if (MAC) { iconSizes = [ @@ -95,6 +100,7 @@ if (LINUX) { [27000, 2000], [27000, 2000], [14000, 2000], + [1000, 2000], ]; } diff --git a/toolkit/webapps/tests/test_packaged_icons.xul b/toolkit/webapps/tests/test_packaged_icons.xul index 3ba18ca56848..15614faea7a5 100644 --- a/toolkit/webapps/tests/test_packaged_icons.xul +++ b/toolkit/webapps/tests/test_packaged_icons.xul @@ -65,6 +65,8 @@ let iconTests = [ {"32": generateDataURI(testIconFile) }, // URI to a file that isn't an image {"32": "/index.html"}, + // Large icon that won't be used on Windows (bug #1152597) + {"512": "http://example.com/chrome/toolkit/webapps/tests/data/512.png"}, ]; // This is an array of the icon sizes associated with the elements of @@ -87,6 +89,7 @@ if (LINUX) { [2787, 0], [2787, 0], [4009, 0], + [2195, 0], ]; } else if (WIN) { iconSizes = [ @@ -95,6 +98,8 @@ if (LINUX) { [4286, 0], [4286, 0], [16958, 0], + // Windows ICO doesn't support 512x512 icons. The default should be chosen. + [16958, 0], ]; } else if (MAC) { iconSizes = [ @@ -103,6 +108,7 @@ if (LINUX) { [27000, 2000], [27000, 2000], [14000, 2000], + [1000, 2000], ]; } From 269fbab986802f98f776e96751c6debb5a98f37f Mon Sep 17 00:00:00 2001 From: Sami Jaktholm Date: Sat, 23 May 2015 07:16:22 +0300 Subject: [PATCH 09/13] Bug 982201 - Don't give up so easily when constructing netmonitor statistics view during tests. r=past In tests it doesn't make sense to give up after two seconds as we want to test the actual feature - not that it can do everything in under two seconds which is quite a long shot on debug builds. The new 45 second timeout during tests matches the 45 second timeout of mochitests which essentially makes it impossible for whenDataAvailable to timeout during tests causing these false positives. --- browser/devtools/netmonitor/netmonitor-controller.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/devtools/netmonitor/netmonitor-controller.js b/browser/devtools/netmonitor/netmonitor-controller.js index 92b11f9a59f6..aaafaf874179 100644 --- a/browser/devtools/netmonitor/netmonitor-controller.js +++ b/browser/devtools/netmonitor/netmonitor-controller.js @@ -799,7 +799,12 @@ function whenDataAvailable(aDataStore, aMandatoryFields) { }; const WDA_DEFAULT_VERIFY_INTERVAL = 50; // ms -const WDA_DEFAULT_GIVE_UP_TIMEOUT = 2000; // ms + +// Use longer timeout during testing as the tests need this process to succeed +// and two seconds is quite short on slow debug builds. The timeout here should +// be at least equal to the general mochitest timeout of 45 seconds so that this +// never gets hit during testing. +const WDA_DEFAULT_GIVE_UP_TIMEOUT = gDevTools.testing ? 45000 : 2000; // ms /** * Helper method for debugging. From 00d8891808aa6aed974a334b5867f5e0c3a8f997 Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Mon, 25 May 2015 17:18:31 +0200 Subject: [PATCH 10/13] Bug 1012597 - Part 1: provide a way to invalidate the Places GUIDs cache. r=rnewman --- toolkit/components/places/PlacesUtils.jsm | 53 +++++++++++++++---- ...est_PlacesUtils_invalidateCachedGuidFor.js | 24 +++++++++ .../components/places/tests/unit/xpcshell.ini | 1 + 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 toolkit/components/places/tests/unit/test_PlacesUtils_invalidateCachedGuidFor.js diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm index e6ecb275ed1c..308956ca78bb 100644 --- a/toolkit/components/places/PlacesUtils.jsm +++ b/toolkit/components/places/PlacesUtils.jsm @@ -1464,7 +1464,9 @@ this.PlacesUtils = { * @resolves to the GUID. * @rejects if aItemId is invalid. */ - promiseItemGuid: function (aItemId) GuidHelper.getItemGuid(aItemId), + promiseItemGuid(aItemId) { + return GuidHelper.getItemGuid(aItemId) + }, /** * Get the item id for an item (a bookmark, a folder or a separator) given @@ -1472,11 +1474,23 @@ this.PlacesUtils = { * * @param aGuid * an item GUID - * @retrun {Promise} + * @return {Promise} * @resolves to the GUID. * @rejects if there's no item for the given GUID. */ - promiseItemId: function (aGuid) GuidHelper.getItemId(aGuid), + promiseItemId(aGuid) { + return GuidHelper.getItemId(aGuid) + }, + + /** + * Invalidate the GUID cache for the given itemId. + * + * @param aItemId + * an item id + */ + invalidateCachedGuidFor(aItemId) { + GuidHelper.invalidateCacheForItemId(aItemId) + }, /** * Asynchronously retrieve a JS-object representation of a places bookmarks @@ -1565,7 +1579,7 @@ this.PlacesUtils = { item.id = itemId; // Cache it for promiseItemId consumers regardless. - GuidHelper.idsForGuids.set(item.guid, itemId); + GuidHelper.updateCache(itemId, item.guid); let type = aRow.getResultByName("type"); if (type == Ci.nsINavBookmarksService.TYPE_BOOKMARK) @@ -2166,7 +2180,7 @@ let GuidHelper = { this.ensureObservingRemovedItems(); let itemId = rows[0].getResultByName("id"); - this.idsForGuids.set(aGuid, itemId); + this.updateCache(itemId, aGuid); return itemId; }), @@ -2185,10 +2199,31 @@ let GuidHelper = { this.ensureObservingRemovedItems(); let guid = rows[0].getResultByName("guid"); - this.guidsForIds.set(aItemId, guid); + this.updateCache(aItemId, guid); return guid; }), + /** + * Updates the cache. + * + * @note This is the only place where the cache should be populated, + * invalidation relies on both Maps being populated at the same time. + */ + updateCache(aItemId, aGuid) { + if (typeof(aItemId) != "number" || aItemId <= 0) + throw new Error("Trying to update the GUIDs cache with an invalid itemId"); + if (typeof(aGuid) != "string" || !/^[a-zA-Z0-9\-_]{12}$/.test(aGuid)) + throw new Error("Trying to update the GUIDs cache with an invalid GUID"); + this.guidsForIds.set(aItemId, aGuid); + this.idsForGuids.set(aGuid, aItemId); + }, + + invalidateCacheForItemId(aItemId) { + let guid = this.guidsForIds.get(aItemId); + this.guidsForIds.delete(aItemId); + this.idsForGuids.delete(guid); + }, + ensureObservingRemovedItems: function () { if (!("observer" in this)) { /** @@ -2201,14 +2236,14 @@ let GuidHelper = { this.observer = { onItemAdded: (aItemId, aParentId, aIndex, aItemType, aURI, aTitle, aDateAdded, aGuid, aParentGuid) => { - this.guidsForIds.set(aItemId, aGuid); - this.guidsForIds.set(aParentId, aParentGuid); + this.updateCache(aItemId, aGuid); + this.updateCache(aParentId, aParentGuid); }, onItemRemoved: (aItemId, aParentId, aIndex, aItemTyep, aURI, aGuid, aParentGuid) => { this.guidsForIds.delete(aItemId); this.idsForGuids.delete(aGuid); - this.guidsForIds.set(aParentId, aParentGuid); + this.updateCache(aParentId, aParentGuid); }, QueryInterface: XPCOMUtils.generateQI(Ci.nsINavBookmarkObserver), diff --git a/toolkit/components/places/tests/unit/test_PlacesUtils_invalidateCachedGuidFor.js b/toolkit/components/places/tests/unit/test_PlacesUtils_invalidateCachedGuidFor.js new file mode 100644 index 000000000000..d42d59e5d93a --- /dev/null +++ b/toolkit/components/places/tests/unit/test_PlacesUtils_invalidateCachedGuidFor.js @@ -0,0 +1,24 @@ +add_task(function* () { + do_print("Add a bookmark."); + let bm = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/", + parentGuid: PlacesUtils.bookmarks.unfiledGuid }); + let id = yield PlacesUtils.promiseItemId(bm.guid); + Assert.equal((yield PlacesUtils.promiseItemGuid(id)), bm.guid); + + // Ensure invalidating a non-existent itemId doesn't throw. + PlacesUtils.invalidateCachedGuidFor(null); + PlacesUtils.invalidateCachedGuidFor(9999); + + do_print("Change the GUID."); + let db = yield PlacesUtils.promiseWrappedConnection(); + yield db.execute("UPDATE moz_bookmarks SET guid = :guid WHERE id = :id", + { guid: "123456789012", id}); + // The cache should still point to the wrong id. + Assert.equal((yield PlacesUtils.promiseItemGuid(id)), bm.guid); + + do_print("Invalidate the cache."); + PlacesUtils.invalidateCachedGuidFor(id); + Assert.equal((yield PlacesUtils.promiseItemGuid(id)), "123456789012"); + Assert.equal((yield PlacesUtils.promiseItemId("123456789012")), id); + yield Assert.rejects(PlacesUtils.promiseItemId(bm.guid), /no item found for the given GUID/); +}); diff --git a/toolkit/components/places/tests/unit/xpcshell.ini b/toolkit/components/places/tests/unit/xpcshell.ini index ac6e04331b00..398b65f9e018 100644 --- a/toolkit/components/places/tests/unit/xpcshell.ini +++ b/toolkit/components/places/tests/unit/xpcshell.ini @@ -120,6 +120,7 @@ skip-if = true [test_placeURIs.js] [test_PlacesSearchAutocompleteProvider.js] [test_PlacesUtils_asyncGetBookmarkIds.js] +[test_PlacesUtils_invalidateCachedGuidFor.js] [test_PlacesUtils_lazyobservers.js] [test_placesTxn.js] [test_preventive_maintenance.js] From 09838630481e61757a8525f8ffc90b4386f5a70e Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Mon, 25 May 2015 17:18:36 +0200 Subject: [PATCH 11/13] Bug 1012597 - Part 2: ensure Sync invalidates the Places GUIDs cache when needed. r=rnewman --- services/cloudsync/CloudSyncPlacesWrapper.jsm | 17 ----------------- services/sync/modules/engines/bookmarks.js | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/services/cloudsync/CloudSyncPlacesWrapper.jsm b/services/cloudsync/CloudSyncPlacesWrapper.jsm index cdddb9a4b20a..7606541b0198 100644 --- a/services/cloudsync/CloudSyncPlacesWrapper.jsm +++ b/services/cloudsync/CloudSyncPlacesWrapper.jsm @@ -80,23 +80,6 @@ PlacesWrapper.prototype = { return deferred.promise; }, - setGuidForLocalId: function (localId, guid) { - let deferred = Promise.defer(); - - let stmt = "UPDATE moz_bookmarks " + - "SET guid = :guid " + - "WHERE id = :item_id"; - let query = this.placesQueries.getQuery(stmt); - - query.params.guid = guid; - query.params.item_id = localId; - - this.asyncQuery(query) - .then(deferred.resolve, deferred.reject); - - return deferred.promise; - }, - getItemsById: function (ids, types) { let deferred = Promise.defer(); let stmt = "SELECT b.id, b.type, b.parent, b.position, b.title, b.guid, b.dateAdded, b.lastModified, p.url " + diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js index 3d0ebcacca29..1774e00c152a 100644 --- a/services/sync/modules/engines/bookmarks.js +++ b/services/sync/modules/engines/bookmarks.js @@ -1154,6 +1154,7 @@ BookmarksStore.prototype = { stmt.params.guid = guid; stmt.params.item_id = id; Async.querySpinningly(stmt); + PlacesUtils.invalidateCachedGuidFor(id); return guid; }, From f982c20c77c57f59cab81902a0eb13f6c6805528 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Mon, 25 May 2015 17:41:58 -0700 Subject: [PATCH 12/13] Back out bc60df62a51e (bug 1167957) for frequent incomprehesible e10s leaks of a docshell in browser_urlbarEnter.js --- .../devtools/debugger/debugger-commands.js | 9 ++--- .../devtools/debugger/debugger-controller.js | 39 +++++-------------- browser/devtools/debugger/debugger-view.js | 17 ++++---- browser/devtools/debugger/panel.js | 4 +- .../test/browser_dbg_addon-console.js | 2 +- .../browser_dbg_addon-modules-unpacked.js | 2 +- .../test/browser_dbg_addon-modules.js | 2 +- .../debugger/test/browser_dbg_addon-panels.js | 2 +- .../test/browser_dbg_addon-sources.js | 4 +- .../test/browser_dbg_breadcrumbs-access.js | 2 +- .../test/browser_dbg_break-on-dom-01.js | 2 +- .../test/browser_dbg_break-on-dom-02.js | 8 ++-- .../test/browser_dbg_break-on-dom-03.js | 2 +- .../test/browser_dbg_break-on-dom-04.js | 2 +- .../test/browser_dbg_break-on-dom-05.js | 2 +- .../test/browser_dbg_break-on-dom-06.js | 2 +- .../test/browser_dbg_break-on-dom-08.js | 2 +- ...browser_dbg_breakpoints-disabled-reload.js | 10 ++--- .../debugger/test/browser_dbg_cmd-blackbox.js | 2 +- .../debugger/test/browser_dbg_cmd-break.js | 2 +- .../debugger/test/browser_dbg_cmd-dbg.js | 2 +- .../browser_dbg_controller-evaluate-01.js | 2 +- .../browser_dbg_controller-evaluate-02.js | 2 +- .../debugger/test/browser_dbg_file-reload.js | 2 +- .../debugger/test/browser_dbg_host-layout.js | 6 +-- .../debugger/test/browser_dbg_listtabs-02.js | 16 ++++---- .../test/browser_dbg_pretty-print-05.js | 2 +- .../test/browser_dbg_pretty-print-06.js | 2 +- .../debugger/test/browser_dbg_stack-07.js | 2 +- ...rowser_dbg_variables-view-accessibility.js | 2 +- .../browser_dbg_variables-view-override-01.js | 2 +- .../browser_dbg_variables-view-override-02.js | 2 +- .../browser_dbg_variables-view-popup-01.js | 2 +- .../browser_dbg_variables-view-popup-02.js | 2 +- .../browser_dbg_variables-view-popup-03.js | 2 +- .../browser_dbg_variables-view-popup-04.js | 2 +- .../browser_dbg_variables-view-popup-05.js | 2 +- .../browser_dbg_variables-view-popup-06.js | 2 +- .../browser_dbg_variables-view-popup-07.js | 2 +- .../browser_dbg_variables-view-popup-08.js | 2 +- .../browser_dbg_variables-view-popup-09.js | 2 +- .../browser_dbg_variables-view-popup-10.js | 2 +- .../browser_dbg_variables-view-popup-11.js | 2 +- .../browser_dbg_variables-view-popup-12.js | 2 +- .../browser_dbg_variables-view-popup-13.js | 2 +- .../browser_dbg_variables-view-popup-15.js | 2 +- .../browser_dbg_variables-view-popup-16.js | 2 +- .../devtools/debugger/views/filter-view.js | 8 +--- .../debugger/views/global-search-view.js | 38 ++++++------------ .../debugger/views/watch-expressions-view.js | 4 +- 50 files changed, 96 insertions(+), 143 deletions(-) diff --git a/browser/devtools/debugger/debugger-commands.js b/browser/devtools/debugger/debugger-commands.js index af4b8486173a..a0459640384f 100644 --- a/browser/devtools/debugger/debugger-commands.js +++ b/browser/devtools/debugger/debugger-commands.js @@ -516,12 +516,9 @@ exports.items.push({ return args.invert ? !value : value; } - const toBlackBox = []; - for (let {attachment: {source}} of dbg._view.Sources.items) { - if (shouldBlackBox(source)) { - toBlackBox.push(source); - } - } + const toBlackBox = [s.attachment.source + for (s of dbg._view.Sources.items) + if (shouldBlackBox(s.attachment.source))]; // If we aren't black boxing any sources, bail out now. diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js index 0b26a1c11c23..314aeb70aef5 100644 --- a/browser/devtools/debugger/debugger-controller.js +++ b/browser/devtools/debugger/debugger-controller.js @@ -456,9 +456,7 @@ function ThreadState() { } ThreadState.prototype = { - get activeThread() { - return DebuggerController.activeThread; - }, + get activeThread() DebuggerController.activeThread, /** * Connect to the current thread client. @@ -544,10 +542,7 @@ function StackFrames() { } StackFrames.prototype = { - get activeThread() { - return DebuggerController.activeThread; - }, - + get activeThread() DebuggerController.activeThread, currentFrameDepth: -1, _currentFrameDescription: FRAME_TYPE.NORMAL, _syncedWatchExpressions: null, @@ -1119,14 +1114,8 @@ function SourceScripts() { } SourceScripts.prototype = { - get activeThread() { - return DebuggerController.activeThread; - }, - - get debuggerClient() { - return DebuggerController.client; - }, - + get activeThread() DebuggerController.activeThread, + get debuggerClient() DebuggerController.client, _cache: new Map(), /** @@ -2454,33 +2443,23 @@ DebuggerController.HitCounts = new HitCounts(); */ Object.defineProperties(window, { "gTarget": { - get: function() { - return DebuggerController._target; - }, + get: function() DebuggerController._target, configurable: true }, "gHostType": { - get: function() { - return DebuggerView._hostType; - }, + get: function() DebuggerView._hostType, configurable: true }, "gClient": { - get: function() { - return DebuggerController.client; - }, + get: function() DebuggerController.client, configurable: true }, "gThreadClient": { - get: function() { - return DebuggerController.activeThread; - }, + get: function() DebuggerController.activeThread, configurable: true }, "gCallStackPageSize": { - get: function() { - return CALL_STACK_PAGE_SIZE; - }, + get: function() CALL_STACK_PAGE_SIZE, configurable: true } }); diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js index 3e27dfb077f8..0f7703f95b3a 100644 --- a/browser/devtools/debugger/debugger-view.js +++ b/browser/devtools/debugger/debugger-view.js @@ -515,17 +515,15 @@ let DebuggerView = { * Gets the visibility state of the instruments pane. * @return boolean */ - get instrumentsPaneHidden() { - return this._instrumentsPane.hasAttribute("pane-collapsed"); - }, + get instrumentsPaneHidden() + this._instrumentsPane.hasAttribute("pane-collapsed"), /** * Gets the currently selected tab in the instruments pane. * @return string */ - get instrumentsPaneTab() { - return this._instrumentsPane.selectedTab.id; - }, + get instrumentsPaneTab() + this._instrumentsPane.selectedTab.id, /** * Sets the instruments pane hidden or visible. @@ -756,10 +754,9 @@ ResultsPanelContainer.prototype = Heritage.extend(WidgetMethods, { * Gets this container's visibility state. * @return boolean */ - get hidden() { - return this._panel.state == "closed" || - this._panel.state == "hiding"; - }, + get hidden() + this._panel.state == "closed" || + this._panel.state == "hiding", /** * Removes all items from this container and hides it. diff --git a/browser/devtools/debugger/panel.js b/browser/devtools/debugger/panel.js index a2d5e656bc04..1411c3e416e2 100644 --- a/browser/devtools/debugger/panel.js +++ b/browser/devtools/debugger/panel.js @@ -68,9 +68,7 @@ DebuggerPanel.prototype = { // DevToolPanel API - get target() { - return this._toolbox.target; - }, + get target() this._toolbox.target, destroy: function() { // Make sure this panel is not already destroyed. diff --git a/browser/devtools/debugger/test/browser_dbg_addon-console.js b/browser/devtools/debugger/test/browser_dbg_addon-console.js index f658476d2e20..3539e5e62d51 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-console.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-console.js @@ -18,7 +18,7 @@ function getCachedMessages(webConsole) { } function test() { - Task.spawn(function*() { + Task.spawn(function () { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js index fb6813752e7d..382f56c4a913 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon5.xpi"; function test() { - Task.spawn(function*() { + Task.spawn(function () { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon5/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules.js b/browser/devtools/debugger/test/browser_dbg_addon-modules.js index 90be4c6dbd71..1f4ae393d79c 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon4.xpi"; function test() { - Task.spawn(function*() { + Task.spawn(function () { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon4/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-panels.js b/browser/devtools/debugger/test/browser_dbg_addon-panels.js index afc1e384b24d..cd417f460b85 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-panels.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-panels.js @@ -14,7 +14,7 @@ let PREFS = [ "devtools.netmonitor.enabled" ]; function test() { - Task.spawn(function*() { + Task.spawn(function () { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-sources.js b/browser/devtools/debugger/test/browser_dbg_addon-sources.js index f285e4fd37c9..89b4ebcbd864 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-sources.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-sources.js @@ -1,14 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Ensure that the sources listed when debugging an addon are either from the +// Ensure that the sources listed when debugging an addon are either from the // addon itself, or the SDK, with proper groups and labels. const ADDON_URL = EXAMPLE_URL + "addon3.xpi"; let gClient; function test() { - Task.spawn(function*() { + Task.spawn(function () { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js index 40b37514feca..40b8a5170a5f 100644 --- a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js +++ b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js @@ -47,7 +47,7 @@ function test() { } function checkNavigationWhileFocused() { - return Task.spawn(function*() { + return Task.spawn(function() { yield promise.all([ waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES), waitForSourceAndCaret(gPanel, "-01.js", 5), diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js index 6297162ff8d0..86be67b0064e 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js @@ -27,7 +27,7 @@ function test() { is(gView.instrumentsPaneTab, "variables-tab", "The variables tab should be selected by default."); - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); is(gEvents.itemCount, 0, "There should be no events before reloading."); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js index d0dedaa61d63..3a5d127c9351 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); yield testFetchOnFocus(); yield testFetchOnReloadWhenFocused(); @@ -23,7 +23,7 @@ function test() { }); function testFetchOnFocus() { - return Task.spawn(function*() { + return Task.spawn(function() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); gView.toggleInstrumentsPane({ visible: true, animated: false }, 1); @@ -42,7 +42,7 @@ function test() { } function testFetchOnReloadWhenFocused() { - return Task.spawn(function*() { + return Task.spawn(function() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); let reloading = once(gDebugger.gTarget, "will-navigate"); @@ -73,7 +73,7 @@ function test() { } function testFetchOnReloadWhenNotFocused() { - return Task.spawn(function*() { + return Task.spawn(function() { gDebugger.on(gDebugger.EVENTS.EVENT_LISTENERS_FETCHED, () => { ok(false, "Shouldn't have fetched any event listeners."); }); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js index 561d9df401bd..bc8e62e94520 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js @@ -13,7 +13,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js index fc49a01c4179..e68c9b0c2cac 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js index d5a9b217583c..5356e5b2254b 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js @@ -17,7 +17,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js index 9a24b0b75892..38e5e3ee3d5b 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js index 10ed59bc3176..ce92a9ac1d8f 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, ".html"); yield callInTab(gTab, "addBodyClickEventListener"); diff --git a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js index 42a0aa618a4f..f9e49147534d 100644 --- a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js @@ -16,7 +16,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gBreakpoints = gDebugger.DebuggerController.Breakpoints; let gBreakpointLocation; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, "-01.js"); gBreakpointLocation = { actor: getSourceActor(gSources, EXAMPLE_URL + "code_script-switching-01.js"), line: 5 }; @@ -41,7 +41,7 @@ function test() { }); function verifyView({ disabled, visible }) { - return Task.spawn(function*() { + return Task.spawn(function() { // It takes a tick for the checkbox in the SideMenuWidget and the // gutter in the editor to get updated. yield waitForTick(); @@ -65,7 +65,7 @@ function test() { // before causing the debuggee to pause, to allow functions to yield first. function testWhenBreakpointEnabledAndFirstSourceShown() { - return Task.spawn(function*() { + return Task.spawn(function() { yield ensureSourceIs(aPanel, "-01.js"); yield verifyView({ disabled: false, visible: true }); @@ -82,7 +82,7 @@ function test() { } function testWhenBreakpointEnabledAndSecondSourceShown() { - return Task.spawn(function*() { + return Task.spawn(function() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: false, visible: false }); @@ -97,7 +97,7 @@ function test() { } function testWhenBreakpointDisabledAndSecondSourceShown() { - return Task.spawn(function*() { + return Task.spawn(function() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: true, visible: false }); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js index c40a9f10b8ea..797efc1a499a 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js @@ -16,7 +16,7 @@ function test() { return Task.spawn(spawnTest).then(finish, helpers.handleError); } -function* spawnTest() { +function spawnTest() { let options = yield helpers.openTab(TEST_URL); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-break.js b/browser/devtools/debugger/test/browser_dbg_cmd-break.js index 8e39fac36748..702c01059586 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-break.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-break.js @@ -18,7 +18,7 @@ function test() { }; helpers.addTabWithToolbar(TAB_URL, aOptions => { - return Task.spawn(function*() { + return Task.spawn(function() { yield helpers.audit(aOptions, [{ setup: 'break', check: { diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js index 81fb43282b04..7627acc4ef79 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js @@ -8,7 +8,7 @@ const TEST_URI = EXAMPLE_URL + "doc_cmd-dbg.html"; function test() { - return Task.spawn(function*() { + return Task.spawn(function() { let options = yield helpers.openTab(TEST_URI); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js index e1f7a8e2634c..41b98756caea 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js index d42060ca75ff..441bac5414a2 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_file-reload.js b/browser/devtools/debugger/test/browser_dbg_file-reload.js index 4c57af75fa21..6b1bd1b041cc 100644 --- a/browser/devtools/debugger/test/browser_dbg_file-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_file-reload.js @@ -15,7 +15,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(aPanel, JS_URL); is(gSources.itemCount, 1, diff --git a/browser/devtools/debugger/test/browser_dbg_host-layout.js b/browser/devtools/debugger/test/browser_dbg_host-layout.js index e07998ff125c..66b9c70bd849 100644 --- a/browser/devtools/debugger/test/browser_dbg_host-layout.js +++ b/browser/devtools/debugger/test/browser_dbg_host-layout.js @@ -9,7 +9,7 @@ let gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host"); function test() { - Task.spawn(function*() { + Task.spawn(function() { yield testHosts(["bottom", "side", "window"], ["horizontal", "vertical", "horizontal"]); yield testHosts(["side", "bottom", "side"], ["vertical", "horizontal", "vertical"]); yield testHosts(["bottom", "side", "bottom"], ["horizontal", "vertical", "horizontal"]); @@ -25,7 +25,7 @@ function testHosts(aHostTypes, aLayoutTypes) { Services.prefs.setCharPref("devtools.toolbox.host", firstHost); - return Task.spawn(function*() { + return Task.spawn(function() { let [tab, debuggee, panel] = yield initDebugger("about:blank"); yield testHost(tab, panel, firstHost, firstLayout); yield switchAndTestHost(tab, panel, secondHost, secondLayout); @@ -38,7 +38,7 @@ function switchAndTestHost(aTab, aPanel, aHostType, aLayoutType) { let gToolbox = aPanel._toolbox; let gDebugger = aPanel.panelWin; - return Task.spawn(function*() { + return Task.spawn(function() { let layoutChanged = once(gDebugger, gDebugger.EVENTS.LAYOUT_CHANGED); let hostChanged = gToolbox.switchHost(aHostType); diff --git a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js index 67eb79ff0a26..d9878a70ab10 100644 --- a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js +++ b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js @@ -74,8 +74,8 @@ function testTabA() { is(tabActors.size, 2, "gTabA opened: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA opened: initial tab present"); - info("actors: " + [...tabActors].map(a => a.url)); - gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; + info("actors: " + [a.url for (a of tabActors)]); + gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA opened: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA opened: new tab title"); }); @@ -118,8 +118,8 @@ function testTabClosed() { is(tabActors.size, 2, "gTabA closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA closed: initial tab present"); - info("actors: " + [...tabActors].map(a => a.url)); - gActorA = [...tabActors].filter(a => a!== gFirstActor)[0]; + info("actors: " + [a.url for (a of tabActors)]); + gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA closed: new tab title"); }); @@ -162,8 +162,8 @@ function testNewWindow() { is(tabActors.size, 3, "gTabC closed: three tabs in list"); ok(tabActors.has(gFirstActor), "gTabC closed: initial tab present"); - info("actors: " + [...tabActors].map(a => a.url)); - gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; + info("actors: " + [a.url for (a of tabActors)]); + gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabC closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabC closed: new tab title"); }); @@ -191,8 +191,8 @@ function testWindowClosed() { is(tabActors.size, 2, "gNewWindow closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gNewWindow closed: initial tab present"); - info("actors: " + [...tabActors].map(a => a.url)); - gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; + info("actors: " + [a.url for (a of tabActors)]); + gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; ok(gActorA.url.match(/^data:text\/html;/), "gNewWindow closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gNewWindow closed: new tab title"); }); diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js index d3e4251e1494..382210645582 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js @@ -19,7 +19,7 @@ function test() { gSources = gDebugger.DebuggerView.Sources; gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(gPanel, TAB_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js index 9d7903df6952..900f66bdf40d 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js @@ -35,7 +35,7 @@ function test() { }; }(gClient.request)); - Task.spawn(function*() { + Task.spawn(function() { yield waitForSourceShown(gPanel, JS_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_stack-07.js b/browser/devtools/debugger/test/browser_dbg_stack-07.js index cb8099ae81a8..d17f958c5848 100644 --- a/browser/devtools/debugger/test/browser_dbg_stack-07.js +++ b/browser/devtools/debugger/test/browser_dbg_stack-07.js @@ -29,7 +29,7 @@ function test() { } function performTest() { - return Task.spawn(function*() { + return Task.spawn(function() { yield selectBottomFrame(); testBottomFrame(4); diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js index 3256bbb319ce..7605b2ccab41 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js @@ -62,7 +62,7 @@ function performTest() { gVariablesView.rawObject = test; gVariablesView.scrollPageSize = 5; - return Task.spawn(function*() { + return Task.spawn(function() { yield waitForTick(); // Part 0: Test generic focus methods on the variables view. diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js index 84391a08fe8e..7b2911c38036 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js index 3750437e1733..641293d117c6 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js index 6ace1c609ad6..030e4405b763 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js index 363a3ad7f39f..630ee0dbe191 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js index f3559debccc2..4ed3375beed1 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js index f485c8fbdbd4..3d4a43bd1391 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js index 1f055c2b63e0..846f063ec8e5 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js index 3a70b33c2641..1855e1ba1c7b 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { requestLongerTimeout(2); - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js index 0621f843d045..b432507328ca 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js index bb6a1b0a4934..045356e54333 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js index 7e5ffbee1820..a06587775d70 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-3.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js index 943bbab27704..0905a05512a0 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js index 63cc5137ae5a..5fc86988eaeb 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js index 843ff2980206..f4b290ae8123 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js index a94ade081552..fad68f92aba1 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_domnode-variables.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js index b9d838269368..1a9e40947c82 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js index 4b4e0407e1e0..2f822a14ea94 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html"; function test() { - Task.spawn(function*() { + Task.spawn(function() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/views/filter-view.js b/browser/devtools/debugger/views/filter-view.js index 03f8cf963a6e..1cc41076302f 100644 --- a/browser/devtools/debugger/views/filter-view.js +++ b/browser/devtools/debugger/views/filter-view.js @@ -170,17 +170,13 @@ FilterView.prototype = { * Returns the current search operator. * @return string */ - get searchOperator() { - return this.searchData[0]; - }, + get searchOperator() this.searchData[0], /** * Returns the current search arguments. * @return array */ - get searchArguments() { - return this.searchData[1]; - }, + get searchArguments() this.searchData[1], /** * Clears the text from the searchbox and any changed views. diff --git a/browser/devtools/debugger/views/global-search-view.js b/browser/devtools/debugger/views/global-search-view.js index 9d4eaa3eadfe..4d96f16ffa96 100644 --- a/browser/devtools/debugger/views/global-search-view.js +++ b/browser/devtools/debugger/views/global-search-view.js @@ -50,10 +50,9 @@ GlobalSearchView.prototype = Heritage.extend(WidgetMethods, { * Gets the visibility state of the global search container. * @return boolean */ - get hidden() { - return this.widget.getAttribute("hidden") == "true" || - this._splitter.getAttribute("hidden") == "true"; - }, + get hidden() + this.widget.getAttribute("hidden") == "true" || + this._splitter.getAttribute("hidden") == "true", /** * Hides and removes all items from this search container. @@ -367,9 +366,7 @@ GlobalResults.prototype = { /** * Gets the number of source results in this store. */ - get matchCount() { - return this._store.length; - } + get matchCount() this._store.length }; /** @@ -403,9 +400,7 @@ SourceResults.prototype = { /** * Gets the number of line results in this store. */ - get matchCount() { - return this._store.length; - }, + get matchCount() this._store.length, /** * Expands the element, showing all the added details. @@ -434,26 +429,21 @@ SourceResults.prototype = { * Gets this element's expanded state. * @return boolean */ - get expanded() { - return this._resultsContainer.getAttribute("hidden") != "true" && - this._arrow.hasAttribute("open"); - }, + get expanded() + this._resultsContainer.getAttribute("hidden") != "true" && + this._arrow.hasAttribute("open"), /** * Sets this element's expanded state. * @param boolean aFlag */ - set expanded(aFlag) { - this[aFlag ? "expand" : "collapse"](); - }, + set expanded(aFlag) this[aFlag ? "expand" : "collapse"](), /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() { - return this._target; - }, + get target() this._target, /** * Customization function for creating this item's UI. @@ -557,17 +547,13 @@ LineResults.prototype = { /** * Gets the number of word results in this store. */ - get matchCount() { - return this._matchCount; - }, + get matchCount() this._matchCount, /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() { - return this._target; - }, + get target() this._target, /** * Customization function for creating this item's UI. diff --git a/browser/devtools/debugger/views/watch-expressions-view.js b/browser/devtools/debugger/views/watch-expressions-view.js index c78ef4b830b2..e3d942e90f19 100644 --- a/browser/devtools/debugger/views/watch-expressions-view.js +++ b/browser/devtools/debugger/views/watch-expressions-view.js @@ -107,7 +107,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ switchExpression: function(aVar, aExpression) { let expressionItem = - [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; + [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; // Remove the watch expression if it's going to be empty or a duplicate. if (!aExpression || this.getAllStrings().indexOf(aExpression) != -1) { @@ -133,7 +133,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ deleteExpression: function(aVar) { let expressionItem = - [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; + [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; // Remove the watch expression. this.remove(expressionItem); From e2db77577a0af664a9deaef4f5c41b126118a18b Mon Sep 17 00:00:00 2001 From: Patrick Brosset Date: Mon, 25 May 2015 09:17:26 +0200 Subject: [PATCH 13/13] Bug 1167957 - Remove spidermonkey specific JS from debugger --- .../devtools/debugger/debugger-commands.js | 9 +++-- .../devtools/debugger/debugger-controller.js | 39 ++++++++++++++----- browser/devtools/debugger/debugger-view.js | 17 ++++---- browser/devtools/debugger/panel.js | 4 +- .../test/browser_dbg_addon-console.js | 2 +- .../browser_dbg_addon-modules-unpacked.js | 2 +- .../test/browser_dbg_addon-modules.js | 2 +- .../debugger/test/browser_dbg_addon-panels.js | 2 +- .../test/browser_dbg_addon-sources.js | 4 +- .../test/browser_dbg_breadcrumbs-access.js | 2 +- .../test/browser_dbg_break-on-dom-01.js | 2 +- .../test/browser_dbg_break-on-dom-02.js | 8 ++-- .../test/browser_dbg_break-on-dom-03.js | 2 +- .../test/browser_dbg_break-on-dom-04.js | 2 +- .../test/browser_dbg_break-on-dom-05.js | 2 +- .../test/browser_dbg_break-on-dom-06.js | 2 +- .../test/browser_dbg_break-on-dom-08.js | 2 +- ...browser_dbg_breakpoints-disabled-reload.js | 10 ++--- .../debugger/test/browser_dbg_cmd-blackbox.js | 2 +- .../debugger/test/browser_dbg_cmd-break.js | 2 +- .../debugger/test/browser_dbg_cmd-dbg.js | 2 +- .../browser_dbg_controller-evaluate-01.js | 2 +- .../browser_dbg_controller-evaluate-02.js | 2 +- .../debugger/test/browser_dbg_file-reload.js | 2 +- .../debugger/test/browser_dbg_host-layout.js | 6 +-- .../debugger/test/browser_dbg_listtabs-02.js | 16 ++++---- .../test/browser_dbg_pretty-print-05.js | 2 +- .../test/browser_dbg_pretty-print-06.js | 2 +- .../debugger/test/browser_dbg_stack-07.js | 2 +- ...rowser_dbg_variables-view-accessibility.js | 2 +- .../browser_dbg_variables-view-override-01.js | 2 +- .../browser_dbg_variables-view-override-02.js | 2 +- .../browser_dbg_variables-view-popup-01.js | 2 +- .../browser_dbg_variables-view-popup-02.js | 2 +- .../browser_dbg_variables-view-popup-03.js | 2 +- .../browser_dbg_variables-view-popup-04.js | 2 +- .../browser_dbg_variables-view-popup-05.js | 2 +- .../browser_dbg_variables-view-popup-06.js | 2 +- .../browser_dbg_variables-view-popup-07.js | 2 +- .../browser_dbg_variables-view-popup-08.js | 2 +- .../browser_dbg_variables-view-popup-09.js | 2 +- .../browser_dbg_variables-view-popup-10.js | 2 +- .../browser_dbg_variables-view-popup-11.js | 2 +- .../browser_dbg_variables-view-popup-12.js | 2 +- .../browser_dbg_variables-view-popup-13.js | 2 +- .../browser_dbg_variables-view-popup-15.js | 2 +- .../browser_dbg_variables-view-popup-16.js | 2 +- .../devtools/debugger/views/filter-view.js | 8 +++- .../debugger/views/global-search-view.js | 38 ++++++++++++------ .../debugger/views/watch-expressions-view.js | 4 +- 50 files changed, 143 insertions(+), 96 deletions(-) diff --git a/browser/devtools/debugger/debugger-commands.js b/browser/devtools/debugger/debugger-commands.js index a0459640384f..af4b8486173a 100644 --- a/browser/devtools/debugger/debugger-commands.js +++ b/browser/devtools/debugger/debugger-commands.js @@ -516,9 +516,12 @@ exports.items.push({ return args.invert ? !value : value; } - const toBlackBox = [s.attachment.source - for (s of dbg._view.Sources.items) - if (shouldBlackBox(s.attachment.source))]; + const toBlackBox = []; + for (let {attachment: {source}} of dbg._view.Sources.items) { + if (shouldBlackBox(source)) { + toBlackBox.push(source); + } + } // If we aren't black boxing any sources, bail out now. diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js index 314aeb70aef5..0b26a1c11c23 100644 --- a/browser/devtools/debugger/debugger-controller.js +++ b/browser/devtools/debugger/debugger-controller.js @@ -456,7 +456,9 @@ function ThreadState() { } ThreadState.prototype = { - get activeThread() DebuggerController.activeThread, + get activeThread() { + return DebuggerController.activeThread; + }, /** * Connect to the current thread client. @@ -542,7 +544,10 @@ function StackFrames() { } StackFrames.prototype = { - get activeThread() DebuggerController.activeThread, + get activeThread() { + return DebuggerController.activeThread; + }, + currentFrameDepth: -1, _currentFrameDescription: FRAME_TYPE.NORMAL, _syncedWatchExpressions: null, @@ -1114,8 +1119,14 @@ function SourceScripts() { } SourceScripts.prototype = { - get activeThread() DebuggerController.activeThread, - get debuggerClient() DebuggerController.client, + get activeThread() { + return DebuggerController.activeThread; + }, + + get debuggerClient() { + return DebuggerController.client; + }, + _cache: new Map(), /** @@ -2443,23 +2454,33 @@ DebuggerController.HitCounts = new HitCounts(); */ Object.defineProperties(window, { "gTarget": { - get: function() DebuggerController._target, + get: function() { + return DebuggerController._target; + }, configurable: true }, "gHostType": { - get: function() DebuggerView._hostType, + get: function() { + return DebuggerView._hostType; + }, configurable: true }, "gClient": { - get: function() DebuggerController.client, + get: function() { + return DebuggerController.client; + }, configurable: true }, "gThreadClient": { - get: function() DebuggerController.activeThread, + get: function() { + return DebuggerController.activeThread; + }, configurable: true }, "gCallStackPageSize": { - get: function() CALL_STACK_PAGE_SIZE, + get: function() { + return CALL_STACK_PAGE_SIZE; + }, configurable: true } }); diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js index 0f7703f95b3a..3e27dfb077f8 100644 --- a/browser/devtools/debugger/debugger-view.js +++ b/browser/devtools/debugger/debugger-view.js @@ -515,15 +515,17 @@ let DebuggerView = { * Gets the visibility state of the instruments pane. * @return boolean */ - get instrumentsPaneHidden() - this._instrumentsPane.hasAttribute("pane-collapsed"), + get instrumentsPaneHidden() { + return this._instrumentsPane.hasAttribute("pane-collapsed"); + }, /** * Gets the currently selected tab in the instruments pane. * @return string */ - get instrumentsPaneTab() - this._instrumentsPane.selectedTab.id, + get instrumentsPaneTab() { + return this._instrumentsPane.selectedTab.id; + }, /** * Sets the instruments pane hidden or visible. @@ -754,9 +756,10 @@ ResultsPanelContainer.prototype = Heritage.extend(WidgetMethods, { * Gets this container's visibility state. * @return boolean */ - get hidden() - this._panel.state == "closed" || - this._panel.state == "hiding", + get hidden() { + return this._panel.state == "closed" || + this._panel.state == "hiding"; + }, /** * Removes all items from this container and hides it. diff --git a/browser/devtools/debugger/panel.js b/browser/devtools/debugger/panel.js index 1411c3e416e2..a2d5e656bc04 100644 --- a/browser/devtools/debugger/panel.js +++ b/browser/devtools/debugger/panel.js @@ -68,7 +68,9 @@ DebuggerPanel.prototype = { // DevToolPanel API - get target() this._toolbox.target, + get target() { + return this._toolbox.target; + }, destroy: function() { // Make sure this panel is not already destroyed. diff --git a/browser/devtools/debugger/test/browser_dbg_addon-console.js b/browser/devtools/debugger/test/browser_dbg_addon-console.js index 3539e5e62d51..f658476d2e20 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-console.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-console.js @@ -18,7 +18,7 @@ function getCachedMessages(webConsole) { } function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js index 382f56c4a913..fb6813752e7d 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules-unpacked.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon5.xpi"; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon5/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-modules.js b/browser/devtools/debugger/test/browser_dbg_addon-modules.js index 1f4ae393d79c..90be4c6dbd71 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-modules.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-modules.js @@ -6,7 +6,7 @@ const ADDON_URL = EXAMPLE_URL + "addon4.xpi"; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let tab1 = yield addTab("chrome://browser_dbg_addon4/content/test.xul"); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-panels.js b/browser/devtools/debugger/test/browser_dbg_addon-panels.js index cd417f460b85..afc1e384b24d 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-panels.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-panels.js @@ -14,7 +14,7 @@ let PREFS = [ "devtools.netmonitor.enabled" ]; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_addon-sources.js b/browser/devtools/debugger/test/browser_dbg_addon-sources.js index 89b4ebcbd864..f285e4fd37c9 100644 --- a/browser/devtools/debugger/test/browser_dbg_addon-sources.js +++ b/browser/devtools/debugger/test/browser_dbg_addon-sources.js @@ -1,14 +1,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Ensure that the sources listed when debugging an addon are either from the +// Ensure that the sources listed when debugging an addon are either from the // addon itself, or the SDK, with proper groups and labels. const ADDON_URL = EXAMPLE_URL + "addon3.xpi"; let gClient; function test() { - Task.spawn(function () { + Task.spawn(function*() { let addon = yield addAddon(ADDON_URL); let addonDebugger = yield initAddonDebugger(ADDON_URL); diff --git a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js index 40b8a5170a5f..40b37514feca 100644 --- a/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js +++ b/browser/devtools/debugger/test/browser_dbg_breadcrumbs-access.js @@ -47,7 +47,7 @@ function test() { } function checkNavigationWhileFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { yield promise.all([ waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES), waitForSourceAndCaret(gPanel, "-01.js", 5), diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js index 86be67b0064e..6297162ff8d0 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-01.js @@ -27,7 +27,7 @@ function test() { is(gView.instrumentsPaneTab, "variables-tab", "The variables tab should be selected by default."); - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); is(gEvents.itemCount, 0, "There should be no events before reloading."); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js index 3a5d127c9351..d0dedaa61d63 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-02.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); yield testFetchOnFocus(); yield testFetchOnReloadWhenFocused(); @@ -23,7 +23,7 @@ function test() { }); function testFetchOnFocus() { - return Task.spawn(function() { + return Task.spawn(function*() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); gView.toggleInstrumentsPane({ visible: true, animated: false }, 1); @@ -42,7 +42,7 @@ function test() { } function testFetchOnReloadWhenFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); let reloading = once(gDebugger.gTarget, "will-navigate"); @@ -73,7 +73,7 @@ function test() { } function testFetchOnReloadWhenNotFocused() { - return Task.spawn(function() { + return Task.spawn(function*() { gDebugger.on(gDebugger.EVENTS.EVENT_LISTENERS_FETCHED, () => { ok(false, "Shouldn't have fetched any event listeners."); }); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js index bc8e62e94520..561d9df401bd 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-03.js @@ -13,7 +13,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js index e68c9b0c2cac..fc49a01c4179 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-04.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js index 5356e5b2254b..d5a9b217583c 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-05.js @@ -17,7 +17,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js index 38e5e3ee3d5b..9a24b0b75892 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-06.js @@ -16,7 +16,7 @@ function test() { let gEvents = gView.EventListeners; let gBreakpoints = gController.Breakpoints; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); let fetched = waitForDebuggerEvents(aPanel, gDebugger.EVENTS.EVENT_LISTENERS_FETCHED); diff --git a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js index ce92a9ac1d8f..10ed59bc3176 100644 --- a/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js +++ b/browser/devtools/debugger/test/browser_dbg_break-on-dom-08.js @@ -14,7 +14,7 @@ function test() { let gView = gDebugger.DebuggerView; let gEvents = gView.EventListeners; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, ".html"); yield callInTab(gTab, "addBodyClickEventListener"); diff --git a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js index f9e49147534d..42a0aa618a4f 100644 --- a/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_breakpoints-disabled-reload.js @@ -16,7 +16,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gBreakpoints = gDebugger.DebuggerController.Breakpoints; let gBreakpointLocation; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, "-01.js"); gBreakpointLocation = { actor: getSourceActor(gSources, EXAMPLE_URL + "code_script-switching-01.js"), line: 5 }; @@ -41,7 +41,7 @@ function test() { }); function verifyView({ disabled, visible }) { - return Task.spawn(function() { + return Task.spawn(function*() { // It takes a tick for the checkbox in the SideMenuWidget and the // gutter in the editor to get updated. yield waitForTick(); @@ -65,7 +65,7 @@ function test() { // before causing the debuggee to pause, to allow functions to yield first. function testWhenBreakpointEnabledAndFirstSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-01.js"); yield verifyView({ disabled: false, visible: true }); @@ -82,7 +82,7 @@ function test() { } function testWhenBreakpointEnabledAndSecondSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: false, visible: false }); @@ -97,7 +97,7 @@ function test() { } function testWhenBreakpointDisabledAndSecondSourceShown() { - return Task.spawn(function() { + return Task.spawn(function*() { yield ensureSourceIs(aPanel, "-02.js", true); yield verifyView({ disabled: true, visible: false }); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js index 797efc1a499a..c40a9f10b8ea 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-blackbox.js @@ -16,7 +16,7 @@ function test() { return Task.spawn(spawnTest).then(finish, helpers.handleError); } -function spawnTest() { +function* spawnTest() { let options = yield helpers.openTab(TEST_URL); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-break.js b/browser/devtools/debugger/test/browser_dbg_cmd-break.js index 702c01059586..8e39fac36748 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-break.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-break.js @@ -18,7 +18,7 @@ function test() { }; helpers.addTabWithToolbar(TAB_URL, aOptions => { - return Task.spawn(function() { + return Task.spawn(function*() { yield helpers.audit(aOptions, [{ setup: 'break', check: { diff --git a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js index 7627acc4ef79..81fb43282b04 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd-dbg.js @@ -8,7 +8,7 @@ const TEST_URI = EXAMPLE_URL + "doc_cmd-dbg.html"; function test() { - return Task.spawn(function() { + return Task.spawn(function*() { let options = yield helpers.openTab(TEST_URI); yield helpers.openToolbar(options); diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js index 41b98756caea..e1f7a8e2634c 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-01.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js index 441bac5414a2..d42060ca75ff 100644 --- a/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js +++ b/browser/devtools/debugger/test/browser_dbg_controller-evaluate-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_script-switching-01.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let frames = win.DebuggerController.StackFrames; diff --git a/browser/devtools/debugger/test/browser_dbg_file-reload.js b/browser/devtools/debugger/test/browser_dbg_file-reload.js index 6b1bd1b041cc..4c57af75fa21 100644 --- a/browser/devtools/debugger/test/browser_dbg_file-reload.js +++ b/browser/devtools/debugger/test/browser_dbg_file-reload.js @@ -15,7 +15,7 @@ function test() { let gSources = gDebugger.DebuggerView.Sources; let gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(aPanel, JS_URL); is(gSources.itemCount, 1, diff --git a/browser/devtools/debugger/test/browser_dbg_host-layout.js b/browser/devtools/debugger/test/browser_dbg_host-layout.js index 66b9c70bd849..e07998ff125c 100644 --- a/browser/devtools/debugger/test/browser_dbg_host-layout.js +++ b/browser/devtools/debugger/test/browser_dbg_host-layout.js @@ -9,7 +9,7 @@ let gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host"); function test() { - Task.spawn(function() { + Task.spawn(function*() { yield testHosts(["bottom", "side", "window"], ["horizontal", "vertical", "horizontal"]); yield testHosts(["side", "bottom", "side"], ["vertical", "horizontal", "vertical"]); yield testHosts(["bottom", "side", "bottom"], ["horizontal", "vertical", "horizontal"]); @@ -25,7 +25,7 @@ function testHosts(aHostTypes, aLayoutTypes) { Services.prefs.setCharPref("devtools.toolbox.host", firstHost); - return Task.spawn(function() { + return Task.spawn(function*() { let [tab, debuggee, panel] = yield initDebugger("about:blank"); yield testHost(tab, panel, firstHost, firstLayout); yield switchAndTestHost(tab, panel, secondHost, secondLayout); @@ -38,7 +38,7 @@ function switchAndTestHost(aTab, aPanel, aHostType, aLayoutType) { let gToolbox = aPanel._toolbox; let gDebugger = aPanel.panelWin; - return Task.spawn(function() { + return Task.spawn(function*() { let layoutChanged = once(gDebugger, gDebugger.EVENTS.LAYOUT_CHANGED); let hostChanged = gToolbox.switchHost(aHostType); diff --git a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js index d9878a70ab10..67eb79ff0a26 100644 --- a/browser/devtools/debugger/test/browser_dbg_listtabs-02.js +++ b/browser/devtools/debugger/test/browser_dbg_listtabs-02.js @@ -74,8 +74,8 @@ function testTabA() { is(tabActors.size, 2, "gTabA opened: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA opened: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA opened: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA opened: new tab title"); }); @@ -118,8 +118,8 @@ function testTabClosed() { is(tabActors.size, 2, "gTabA closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gTabA closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a!== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabA closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabA closed: new tab title"); }); @@ -162,8 +162,8 @@ function testNewWindow() { is(tabActors.size, 3, "gTabC closed: three tabs in list"); ok(tabActors.has(gFirstActor), "gTabC closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gTabC closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gTabC closed: new tab title"); }); @@ -191,8 +191,8 @@ function testWindowClosed() { is(tabActors.size, 2, "gNewWindow closed: two tabs in list"); ok(tabActors.has(gFirstActor), "gNewWindow closed: initial tab present"); - info("actors: " + [a.url for (a of tabActors)]); - gActorA = [a for (a of tabActors) if (a !== gFirstActor)][0]; + info("actors: " + [...tabActors].map(a => a.url)); + gActorA = [...tabActors].filter(a => a !== gFirstActor)[0]; ok(gActorA.url.match(/^data:text\/html;/), "gNewWindow closed: new tab URL"); is(gActorA.title, "JS Debugger BrowserTabList test page", "gNewWindow closed: new tab title"); }); diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js index 382210645582..d3e4251e1494 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-05.js @@ -19,7 +19,7 @@ function test() { gSources = gDebugger.DebuggerView.Sources; gControllerSources = gDebugger.DebuggerController.SourceScripts; - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(gPanel, TAB_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js index 900f66bdf40d..9d7903df6952 100644 --- a/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js +++ b/browser/devtools/debugger/test/browser_dbg_pretty-print-06.js @@ -35,7 +35,7 @@ function test() { }; }(gClient.request)); - Task.spawn(function() { + Task.spawn(function*() { yield waitForSourceShown(gPanel, JS_URL); // From this point onward, the source editor's text should never change. diff --git a/browser/devtools/debugger/test/browser_dbg_stack-07.js b/browser/devtools/debugger/test/browser_dbg_stack-07.js index d17f958c5848..cb8099ae81a8 100644 --- a/browser/devtools/debugger/test/browser_dbg_stack-07.js +++ b/browser/devtools/debugger/test/browser_dbg_stack-07.js @@ -29,7 +29,7 @@ function test() { } function performTest() { - return Task.spawn(function() { + return Task.spawn(function*() { yield selectBottomFrame(); testBottomFrame(4); diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js index 7605b2ccab41..3256bbb319ce 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-accessibility.js @@ -62,7 +62,7 @@ function performTest() { gVariablesView.rawObject = test; gVariablesView.scrollPageSize = 5; - return Task.spawn(function() { + return Task.spawn(function*() { yield waitForTick(); // Part 0: Test generic focus methods on the variables view. diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js index 7b2911c38036..84391a08fe8e 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js index 641293d117c6..3750437e1733 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-override-02.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-2.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js index 030e4405b763..6ace1c609ad6 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-01.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js index 630ee0dbe191..363a3ad7f39f 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-02.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js index 4ed3375beed1..f3559debccc2 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-03.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js index 3d4a43bd1391..f485c8fbdbd4 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-04.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js index 846f063ec8e5..1f055c2b63e0 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-05.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js index 1855e1ba1c7b..3a70b33c2641 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-06.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { requestLongerTimeout(2); - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js index b432507328ca..0621f843d045 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-07.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js index 045356e54333..bb6a1b0a4934 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-08.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js index a06587775d70..7e5ffbee1820 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-09.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_scope-variable-3.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js index 0905a05512a0..943bbab27704 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-10.js @@ -10,7 +10,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js index 5fc86988eaeb..63cc5137ae5a 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-11.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js index f4b290ae8123..843ff2980206 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-12.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_watch-expression-button.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js index fad68f92aba1..a94ade081552 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-13.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_domnode-variables.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js index 1a9e40947c82..b9d838269368 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-15.js @@ -8,7 +8,7 @@ const TAB_URL = EXAMPLE_URL + "doc_frame-parameters.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let bubble = win.DebuggerView.VariableBubble; diff --git a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js index 2f822a14ea94..4b4e0407e1e0 100644 --- a/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js +++ b/browser/devtools/debugger/test/browser_dbg_variables-view-popup-16.js @@ -9,7 +9,7 @@ const TAB_URL = EXAMPLE_URL + "doc_recursion-stack.html"; function test() { - Task.spawn(function() { + Task.spawn(function*() { let [tab,, panel] = yield initDebugger(TAB_URL); let win = panel.panelWin; let events = win.EVENTS; diff --git a/browser/devtools/debugger/views/filter-view.js b/browser/devtools/debugger/views/filter-view.js index 1cc41076302f..03f8cf963a6e 100644 --- a/browser/devtools/debugger/views/filter-view.js +++ b/browser/devtools/debugger/views/filter-view.js @@ -170,13 +170,17 @@ FilterView.prototype = { * Returns the current search operator. * @return string */ - get searchOperator() this.searchData[0], + get searchOperator() { + return this.searchData[0]; + }, /** * Returns the current search arguments. * @return array */ - get searchArguments() this.searchData[1], + get searchArguments() { + return this.searchData[1]; + }, /** * Clears the text from the searchbox and any changed views. diff --git a/browser/devtools/debugger/views/global-search-view.js b/browser/devtools/debugger/views/global-search-view.js index 4d96f16ffa96..9d4eaa3eadfe 100644 --- a/browser/devtools/debugger/views/global-search-view.js +++ b/browser/devtools/debugger/views/global-search-view.js @@ -50,9 +50,10 @@ GlobalSearchView.prototype = Heritage.extend(WidgetMethods, { * Gets the visibility state of the global search container. * @return boolean */ - get hidden() - this.widget.getAttribute("hidden") == "true" || - this._splitter.getAttribute("hidden") == "true", + get hidden() { + return this.widget.getAttribute("hidden") == "true" || + this._splitter.getAttribute("hidden") == "true"; + }, /** * Hides and removes all items from this search container. @@ -366,7 +367,9 @@ GlobalResults.prototype = { /** * Gets the number of source results in this store. */ - get matchCount() this._store.length + get matchCount() { + return this._store.length; + } }; /** @@ -400,7 +403,9 @@ SourceResults.prototype = { /** * Gets the number of line results in this store. */ - get matchCount() this._store.length, + get matchCount() { + return this._store.length; + }, /** * Expands the element, showing all the added details. @@ -429,21 +434,26 @@ SourceResults.prototype = { * Gets this element's expanded state. * @return boolean */ - get expanded() - this._resultsContainer.getAttribute("hidden") != "true" && - this._arrow.hasAttribute("open"), + get expanded() { + return this._resultsContainer.getAttribute("hidden") != "true" && + this._arrow.hasAttribute("open"); + }, /** * Sets this element's expanded state. * @param boolean aFlag */ - set expanded(aFlag) this[aFlag ? "expand" : "collapse"](), + set expanded(aFlag) { + this[aFlag ? "expand" : "collapse"](); + }, /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() this._target, + get target() { + return this._target; + }, /** * Customization function for creating this item's UI. @@ -547,13 +557,17 @@ LineResults.prototype = { /** * Gets the number of word results in this store. */ - get matchCount() this._matchCount, + get matchCount() { + return this._matchCount; + }, /** * Gets the element associated with this item. * @return nsIDOMNode */ - get target() this._target, + get target() { + return this._target; + }, /** * Customization function for creating this item's UI. diff --git a/browser/devtools/debugger/views/watch-expressions-view.js b/browser/devtools/debugger/views/watch-expressions-view.js index e3d942e90f19..c78ef4b830b2 100644 --- a/browser/devtools/debugger/views/watch-expressions-view.js +++ b/browser/devtools/debugger/views/watch-expressions-view.js @@ -107,7 +107,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ switchExpression: function(aVar, aExpression) { let expressionItem = - [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; + [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; // Remove the watch expression if it's going to be empty or a duplicate. if (!aExpression || this.getAllStrings().indexOf(aExpression) != -1) { @@ -133,7 +133,7 @@ WatchExpressionsView.prototype = Heritage.extend(WidgetMethods, { */ deleteExpression: function(aVar) { let expressionItem = - [i for (i of this) if (i.attachment.currentExpression == aVar.name)][0]; + [...this].filter(i => i.attachment.currentExpression == aVar.name)[0]; // Remove the watch expression. this.remove(expressionItem);