diff --git a/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js b/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js index 54973353c2a1..a179a2d0a6fc 100644 --- a/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js +++ b/browser/devtools/debugger/test/browser_dbg_aaa_run_first_leaktest.js @@ -31,6 +31,8 @@ function test() gDebugger = gPane.panelWin; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; executeSoon(startTest); @@ -47,12 +49,10 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: performTest }, 0); } diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js index a992408c150b..03ce1628a6c8 100644 --- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js +++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-01.js @@ -116,7 +116,7 @@ function test() addAndCheckExpressions(total, index, "", true); for (let i = 0; i < string.length; i++) { - EventUtils.sendChar(string[i]); + EventUtils.sendChar(string[i], gDebugger); } gDebugger.editor.focus(); diff --git a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js index 5f596654c1c4..011a4bf39a91 100644 --- a/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js +++ b/browser/devtools/debugger/test/browser_dbg_bug727429_watch-expressions-02.js @@ -126,7 +126,7 @@ function test() }); executeSoon(function() { gWatch.addExpression("a = 5"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } @@ -138,7 +138,7 @@ function test() }); executeSoon(function() { gWatch.addExpression("encodeURI(\"\\\")"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } @@ -150,7 +150,7 @@ function test() }) executeSoon(function() { gWatch.addExpression("decodeURI(\"\\\")"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } @@ -162,7 +162,7 @@ function test() }); executeSoon(function() { gWatch.addExpression("?"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } @@ -174,7 +174,7 @@ function test() }); executeSoon(function() { gWatch.addExpression("a"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js index 332c31d6bba2..ef2834bef60c 100644 --- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js +++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js @@ -31,6 +31,8 @@ function test() gDebugger = gPane.panelWin; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; executeSoon(startTest); @@ -46,13 +48,11 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { testStarted = true; - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); Services.tm.currentThread.dispatch({ run: performTest }, 0); } } diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js index 488a16b7985e..1fdce66824f2 100644 --- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js +++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js @@ -36,6 +36,8 @@ function test() gDebugger.DebuggerView.togglePanes({ visible: true, animated: false }); resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; executeSoon(startTest); @@ -52,12 +54,10 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: addBreakpoints }, 0); } diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js index a8d15758e1cc..ea5e98d76579 100644 --- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js +++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-02.js @@ -37,6 +37,8 @@ function test() gBreakpoints = gDebugger.DebuggerController.Breakpoints; gBreakpointsPane = gDebugger.DebuggerView.Breakpoints; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerView.togglePanes({ visible: true, animated: false }); resumed = true; @@ -56,12 +58,10 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: performTest }, 0); } @@ -166,7 +166,7 @@ function test() function modBreakpoint3() { write("bamboocha"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); waitForBreakpoint(14, function() { waitForCaretPos(13, function() { @@ -568,7 +568,7 @@ function test() gBreakpointsPane._cbTextbox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js index 7fdf0f1bd379..c5289f389180 100644 --- a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js +++ b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js @@ -22,6 +22,15 @@ function test() gPane = aPane; gDebugger = gPane.panelWin; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("browser_dbg_stack") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -30,15 +39,6 @@ function test() gDebuggee.simpleCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("browser_dbg_stack") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js index ac38e310596b..6013bc218755 100644 --- a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js +++ b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js @@ -22,6 +22,15 @@ function test() gPane = aPane; gDebugger = gPane.panelWin; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("browser_dbg_stack") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -30,15 +39,6 @@ function test() gDebuggee.simpleCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("browser_dbg_stack") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js index 8e66d3ad8ea8..0ce1c95aab81 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit-watch.js @@ -154,8 +154,8 @@ function testModification(aVar, aTest, aCallback, aNewValue, aNewResult, aArgRes aLocalScopeIndex = 1, aDeletionFlag = null) { function makeChangesAndExitInputMode() { - EventUtils.sendString(aNewValue); - EventUtils.sendKey("RETURN"); + EventUtils.sendString(aNewValue, gDebugger); + EventUtils.sendKey("RETURN", gDebugger); } EventUtils.sendMouseEvent({ type: "dblclick" }, diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js index 6002679efd70..8dcff81804bb 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-edit.js @@ -65,8 +65,8 @@ function testFrameEval() { function testModification(aVar, aCallback, aNewValue, aNewResult) { function makeChangesAndExitInputMode() { - EventUtils.sendString(aNewValue); - EventUtils.sendKey("RETURN"); + EventUtils.sendString(aNewValue, gDebugger); + EventUtils.sendKey("RETURN", gDebugger); } EventUtils.sendMouseEvent({ type: "click" }, diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js index 4ed7087dc926..906c54c01e04 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-01.js @@ -502,7 +502,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js index b144b04faf6f..a9306a32b7fe 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-02.js @@ -444,7 +444,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js index 5cfc55b617f4..3d928d3aaf47 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-05.js @@ -69,7 +69,7 @@ function testVariablesFiltering() is(oneItem.expanded, false, "The one item in the inner scope should not be expanded"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); is(oneItem.expanded, true, "The one item in the inner scope should now be expanded"); } @@ -108,7 +108,7 @@ function testVariablesFiltering() is(twoItem.expanded, false, "The two item in the inner scope should not be expanded"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); is(twoItem.expanded, true, "The two item in the inner scope should now be expanded"); } @@ -285,7 +285,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger) } } @@ -293,7 +293,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js index 715edec78a7a..7163700563c5 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-06.js @@ -41,7 +41,7 @@ function testVariablesFiltering() test2: function() { assertExpansion(2, [true, false, false, false, false]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test3: function() { @@ -55,7 +55,7 @@ function testVariablesFiltering() }, test5: function() { assertExpansion(5, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test6: function() { assertExpansion(6, [true, true, true, true, true]); @@ -67,7 +67,7 @@ function testVariablesFiltering() }, test8: function() { assertExpansion(8, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test9: function() { assertExpansion(9, [true, true, true, true, true]); @@ -87,7 +87,7 @@ function testVariablesFiltering() }, test12: function() { assertExpansion(12, [false, false, false, false, false]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test13: function() { assertExpansion(13, [false, false, false, false, false]); @@ -99,7 +99,7 @@ function testVariablesFiltering() }, test15: function() { assertExpansion(15, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test16: function() { assertExpansion(16, [true, true, true, true, true]); @@ -111,7 +111,7 @@ function testVariablesFiltering() }, test18: function() { assertExpansion(18, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test19: function() { assertExpansion(19, [true, true, true, true, true]); @@ -227,7 +227,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger) } } @@ -235,7 +235,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js index 1d06831c063e..3d4d478b8848 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-07.js @@ -41,7 +41,7 @@ function testVariablesFiltering() test2: function() { assertExpansion(2, [true, false, false, false, false]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test3: function() { @@ -55,7 +55,7 @@ function testVariablesFiltering() }, test5: function() { assertExpansion(5, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test6: function() { assertExpansion(6, [true, true, true, true, true]); @@ -67,7 +67,7 @@ function testVariablesFiltering() }, test8: function() { assertExpansion(8, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test9: function() { assertExpansion(9, [true, true, true, true, true]); @@ -87,7 +87,7 @@ function testVariablesFiltering() }, test12: function() { assertExpansion(12, [false, false, false, false, false]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test13: function() { assertExpansion(13, [false, false, false, false, false]); @@ -99,7 +99,7 @@ function testVariablesFiltering() }, test15: function() { assertExpansion(15, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test16: function() { assertExpansion(16, [true, true, true, true, true]); @@ -111,7 +111,7 @@ function testVariablesFiltering() }, test18: function() { assertExpansion(18, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }, test19: function() { assertExpansion(19, [true, true, true, true, true]); @@ -232,7 +232,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger); } } @@ -240,7 +240,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js index 5086d2158e24..708a93099f95 100644 --- a/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js +++ b/browser/devtools/debugger/test/browser_dbg_propertyview-filter-08.js @@ -47,7 +47,7 @@ function testVariablesFiltering() "The arguments pseudoarray in the testScope should not be expanded"); assertExpansion(1, [true, true, true, true, true]); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); aCallback(); }, test3: function(aCallback) @@ -302,7 +302,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger); } } @@ -310,7 +310,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } } diff --git a/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js b/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js index 20df4582ebdd..47846e46b9c4 100644 --- a/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js +++ b/browser/devtools/debugger/test/browser_dbg_reload-preferred-script.js @@ -31,6 +31,8 @@ function test() gView = gDebugger.DebuggerView; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gView.Sources.preferredSource = EXAMPLE_URL + expectedScript; startTest(); }); @@ -42,12 +44,10 @@ function test() startTest(); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (expectedScriptShown && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: performTest }, 0); } diff --git a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js index 4878978d307e..bee00530f48c 100644 --- a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js +++ b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js @@ -32,6 +32,8 @@ function test() gView = gDebugger.DebuggerView; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + startTest(); }); @@ -55,13 +57,11 @@ function test() testScriptShown(); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (expectedScriptShown && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); - window.addEventListener("Debugger:SourceShown", onUlteriorScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.addEventListener("Debugger:SourceShown", onUlteriorScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: performTest }, 0); } @@ -70,7 +70,7 @@ function test() function finishTest() { if (expectedScriptShown && resumed && testStarted) { - window.removeEventListener("Debugger:SourceShown", onUlteriorScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onUlteriorScriptShown); closeDebuggerAndFinish(); } } diff --git a/browser/devtools/debugger/test/browser_dbg_script-switching.js b/browser/devtools/debugger/test/browser_dbg_script-switching.js index cc794044e92a..89c53a24e474 100644 --- a/browser/devtools/debugger/test/browser_dbg_script-switching.js +++ b/browser/devtools/debugger/test/browser_dbg_script-switching.js @@ -28,6 +28,8 @@ function test() gDebugger = gPane.panelWin; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; executeSoon(startTest); @@ -44,12 +46,10 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: testScriptsDisplay }, 0); } @@ -87,10 +87,10 @@ function testScriptsDisplay() { is(gDebugger.editor.getDebugLocation(), 5, "editor debugger location is correct."); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { let url = aEvent.detail.url; if (url.indexOf("-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); testSwitchPaused(); } }); @@ -110,10 +110,10 @@ function testSwitchPaused() "editor debugger location has been cleared."); gDebugger.DebuggerController.activeThread.resume(function() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { let url = aEvent.detail.url; if (url.indexOf("-02.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); testSwitchRunning(); } }); diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js index 5aa687dc9c28..8e76e13c469a 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js @@ -26,6 +26,12 @@ function test() gPane = aPane; gDebugger = gPane.panelWin; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); + scriptShown = true; + runTest(); + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -34,12 +40,6 @@ function test() gDebuggee.simpleCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); - scriptShown = true; - runTest(); - }); - function runTest() { if (scriptShown && framesAdded) { @@ -63,35 +63,35 @@ function testScriptSearching() { gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line."); - EventUtils.synthesizeKey("g", { metaKey: true }); + EventUtils.synthesizeKey("g", { metaKey: true }, gDebugger); ok(gEditor.getCaretPosition().line == 12 && gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line after Meta+G"); - EventUtils.synthesizeKey("n", { ctrlKey: true }); + EventUtils.synthesizeKey("n", { ctrlKey: true }, gDebugger); ok(gEditor.getCaretPosition().line == 13 && gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line after Ctrl+N"); - EventUtils.synthesizeKey("G", { metaKey: true, shiftKey: true }); + EventUtils.synthesizeKey("G", { metaKey: true, shiftKey: true }, gDebugger); ok(gEditor.getCaretPosition().line == 12 && gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line after Meta+Shift+G"); - EventUtils.synthesizeKey("p", { ctrlKey: true }); + EventUtils.synthesizeKey("p", { ctrlKey: true }, gDebugger); ok(gEditor.getCaretPosition().line == 11 && gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line after Ctrl+P"); for (let i = 0; i < 100; i++) { - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); } ok(gEditor.getCaretPosition().line == 32 && gEditor.getCaretPosition().col == 0, "The editor didn't jump to the correct line after multiple DOWN keys"); for (let i = 0; i < 100; i++) { - EventUtils.sendKey("UP"); + EventUtils.sendKey("UP", gDebugger); } ok(gEditor.getCaretPosition().line == 0 && gEditor.getCaretPosition().col == 0, @@ -104,27 +104,27 @@ function testScriptSearching() { gEditor.getCaretPosition().col == 44 + token.length, "The editor didn't jump to the correct token. (1)"); - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); ok(gEditor.getCaretPosition().line == 8 && gEditor.getCaretPosition().col == 2 + token.length, "The editor didn't jump to the correct token. (2)"); - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); ok(gEditor.getCaretPosition().line == 12 && gEditor.getCaretPosition().col == 8 + token.length, "The editor didn't jump to the correct token. (3)"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); ok(gEditor.getCaretPosition().line == 19 && gEditor.getCaretPosition().col == 4 + token.length, "The editor didn't jump to the correct token. (4)"); - EventUtils.sendKey("ENTER"); + EventUtils.sendKey("ENTER", gDebugger); ok(gEditor.getCaretPosition().line == 2 && gEditor.getCaretPosition().col == 44 + token.length, "The editor didn't jump to the correct token. (5)"); - EventUtils.sendKey("UP"); + EventUtils.sendKey("UP", gDebugger); ok(gEditor.getCaretPosition().line == 19 && gEditor.getCaretPosition().col == 4 + token.length, "The editor didn't jump to the correct token. (5.1)"); @@ -227,14 +227,14 @@ function testScriptSearching() { "The menulist should not display a notice that matches are found."); clear(); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); ok(gEditor.getCaretPosition().line == 2 && gEditor.getCaretPosition().col == 44 + token.length, "The editor shouldn't jump to another token. (12.2)"); isnot(gMenulist.getAttribute("label"), noMatchingScripts, "The menulist should not display a notice that matches are found."); - EventUtils.sendKey("ENTER"); + EventUtils.sendKey("ENTER", gDebugger); ok(gEditor.getCaretPosition().line == 2 && gEditor.getCaretPosition().col == 44 + token.length, "The editor shouldn't jump to another token. (12.3)"); @@ -252,27 +252,27 @@ function testScriptSearching() { gEditor.getCaretPosition().col == 44 + token.length, "The editor didn't jump to the correct token. (14)"); - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); ok(gEditor.getCaretPosition().line == 8 && gEditor.getCaretPosition().col == 2 + token.length, "The editor didn't jump to the correct token. (15)"); - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); ok(gEditor.getCaretPosition().line == 12 && gEditor.getCaretPosition().col == 8 + token.length, "The editor didn't jump to the correct token. (16)"); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); ok(gEditor.getCaretPosition().line == 19 && gEditor.getCaretPosition().col == 4 + token.length, "The editor didn't jump to the correct token. (17)"); - EventUtils.sendKey("ENTER"); + EventUtils.sendKey("ENTER", gDebugger); ok(gEditor.getCaretPosition().line == 2 && gEditor.getCaretPosition().col == 44 + token.length, "The editor didn't jump to the correct token. (18)"); - EventUtils.sendKey("UP"); + EventUtils.sendKey("UP", gDebugger); ok(gEditor.getCaretPosition().line == 19 && gEditor.getCaretPosition().col == 4 + token.length, "The editor didn't jump to the correct token. (18.1)"); @@ -305,7 +305,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js index 561ee22b5268..0bc431df69da 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js @@ -28,6 +28,15 @@ function test() gPane = aPane; gDebugger = gPane.panelWin; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -36,15 +45,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -65,13 +65,13 @@ function testScriptSearching() { } function firstSearch() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); let url = aEvent.detail.url; if (url.indexOf("-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -91,13 +91,13 @@ function firstSearch() { function secondSearch() { let token = "deb"; - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); let url = aEvent.detail.url; if (url.indexOf("-02.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { append("#" + token); @@ -117,13 +117,13 @@ function secondSearch() { } function waitForFirstScript() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); let url = aEvent.detail.url; if (url.indexOf("-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { thirdSearch(); @@ -136,13 +136,13 @@ function waitForFirstScript() { function thirdSearch() { let token = "deb"; - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); let url = aEvent.detail.url; if (url.indexOf("-02.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -167,7 +167,7 @@ function fourthSearch(i, string, token) { "The editor didn't remain at the correct token. (4)"); if (string[i]) { - EventUtils.sendChar(string[i]); + EventUtils.sendChar(string[i], gDebugger); fourthSearch(i + 1, string, token); return; } @@ -245,7 +245,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js index 841eeb86045f..58319c853386 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-03.js @@ -30,6 +30,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -38,15 +47,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -74,8 +74,8 @@ function firstSearch() { is(gSearchView._splitter.hidden, true, "The global search pane splitter shouldn't be visible yet."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -190,8 +190,8 @@ function secondSearch() { is(gSearchView._splitter.hidden, false, "The global search pane splitter should be visible from the previous search."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -311,7 +311,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger); } } @@ -319,7 +319,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js index 0fa7b316f0a4..b17327bf2763 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-04.js @@ -30,6 +30,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -38,15 +47,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -74,8 +74,8 @@ function doSearch() { is(gSearchView._splitter.hidden, true, "The global search pane splitter shouldn't be visible yet."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -108,8 +108,8 @@ function doSearch() { } function doFirstJump() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -130,13 +130,13 @@ function doFirstJump() { } }); executeSoon(function() { - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); }); } function doSecondJump() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -157,13 +157,13 @@ function doSecondJump() { } }); executeSoon(function() { - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); }); } function doWrapAroundJump() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -184,13 +184,13 @@ function doWrapAroundJump() { } }); executeSoon(function() { - EventUtils.sendKey("ENTER"); + EventUtils.sendKey("ENTER", gDebugger); }); } function doBackwardsWrapAroundJump() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -211,13 +211,13 @@ function doBackwardsWrapAroundJump() { } }); executeSoon(function() { - EventUtils.sendKey("UP"); + EventUtils.sendKey("UP", gDebugger); }); } function testSearchTokenEmpty() { - window.addEventListener("Debugger:GlobalSearch:TokenEmpty", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:TokenEmpty", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -259,7 +259,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger); } } @@ -267,7 +267,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js index 88386b89eab1..8bd5277662a8 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js @@ -30,6 +30,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -38,15 +47,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -74,8 +74,8 @@ function doSearch() { is(gSearchView._splitter.hidden, true, "The global search pane splitter shouldn't be visible yet."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -118,8 +118,8 @@ function testLocationChange() } } - window.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onViewCleared(aEvent) { - window.removeEventListener(aEvent.type, _onViewCleared); + gDebugger.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onViewCleared(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onViewCleared); is(gSearchView._container._list.childNodes.length, 0, "The global search pane shouldn't have any child nodes after a page navigation."); @@ -132,8 +132,8 @@ function testLocationChange() _maybeFinish(); }); - window.addEventListener("Debugger:GlobalSearch:CacheCleared", function _onCacheCleared(aEvent) { - window.removeEventListener(aEvent.type, _onCacheCleared); + gDebugger.addEventListener("Debugger:GlobalSearch:CacheCleared", function _onCacheCleared(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onCacheCleared); is(gSearchView._cache.size, 0, "The scripts sources cache for global searching should be cleared after a page navigation.") @@ -159,7 +159,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js index 8276367e78f7..e4914417ebcb 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-06.js @@ -30,6 +30,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -38,15 +47,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -67,8 +67,8 @@ function testScriptSearching() { } function doSearch() { - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -94,8 +94,8 @@ function doSearch() { } function testSearchMatchNotFound() { - window.addEventListener("Debugger:GlobalSearch:MatchNotFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchNotFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -132,7 +132,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js index aa66d3d4f3d0..1397c5585d56 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-07.js @@ -31,6 +31,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -39,15 +48,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -68,8 +68,8 @@ function testScriptSearching() { } function doSearch() { - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -170,8 +170,8 @@ function testClickLineToJump(scriptResults, callbacks) { is(firstHeaderItem.instance.expanded, true, "The first script results should be expanded after direct function call."); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -205,8 +205,8 @@ function testClickMatchToJump(scriptResults, callbacks) { is(secondHeaderItem.instance.expanded, true, "The second script results should be expanded after direct function call."); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + aEvent.detail.url + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -246,7 +246,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js index afd1b4107abd..2d8a9124359f 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-08.js @@ -30,6 +30,15 @@ function test() gDebugger = gPane.panelWin; gDebugger.SourceResults.prototype.alwaysExpand = false; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -38,15 +47,6 @@ function test() gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { @@ -70,8 +70,8 @@ function doSearch() { is(gSearchView._container._parent.hidden, true, "The global search pane shouldn't be visible yet."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -94,8 +94,8 @@ function testFocusLost() is(gSearchView._container._parent.hidden, false, "The global search pane should be visible after a search."); - window.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -117,8 +117,8 @@ function reshowSearch() { is(gSearchView._container._parent.hidden, true, "The global search pane shouldn't be visible after the search was stopped."); - window.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:MatchFound", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -141,8 +141,8 @@ function testEscape() is(gSearchView._container._parent.hidden, false, "The global search pane should be visible after a re-search."); - window.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("Debugger:GlobalSearch:ViewCleared", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -180,19 +180,19 @@ function write(text) { function sendEnter() { gSearchBox.focus(); - EventUtils.sendKey("ENTER"); + EventUtils.sendKey("ENTER", gDebugger); } function sendEscape() { gSearchBox.focus(); - EventUtils.sendKey("ESCAPE"); + EventUtils.sendKey("ESCAPE", gDebugger); } function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-files_ui.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-files_ui.js index e2ebf6cdc1a9..363e857dc5ce 100644 --- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-files_ui.js +++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-files_ui.js @@ -25,12 +25,13 @@ function test() gDebuggee = aDebuggee; gPane = aPane; gDebugger = gPane.panelWin; + + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); + Services.tm.currentThread.dispatch({ run: testScriptSearching }, 0); + }); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); - Services.tm.currentThread.dispatch({ run: testScriptSearching }, 0); - }); } function testScriptSearching() { @@ -44,8 +45,8 @@ function testScriptSearching() { } function firstSearch() { - window.addEventListener("popupshown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("popupshown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -107,13 +108,13 @@ function secondSearch() { let popupshown = false; let proceeded = false; - window.addEventListener("Debugger:SourceShown", function _onEvent1(aEvent) { - window.removeEventListener(aEvent.type, _onEvent1); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent1(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent1); sourceshown = true; executeSoon(proceed); }); - window.addEventListener("popupshown", function _onEvent2(aEvent) { - window.removeEventListener(aEvent.type, _onEvent2); + gDebugger.addEventListener("popupshown", function _onEvent2(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent2); popupshown = true; executeSoon(proceed); }); @@ -184,13 +185,13 @@ function thirdSearch() { let popupshown = false; let proceeded = false; - window.addEventListener("Debugger:SourceShown", function _onEvent1(aEvent) { - window.removeEventListener(aEvent.type, _onEvent1); + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent1(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent1); sourceshown = true; executeSoon(proceed); }); - window.addEventListener("popupshown", function _onEvent2(aEvent) { - window.removeEventListener(aEvent.type, _onEvent2); + gDebugger.addEventListener("popupshown", function _onEvent2(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent2); popupshown = true; executeSoon(proceed); }); @@ -257,7 +258,7 @@ function thirdSearch() { } function goDown() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -275,7 +276,7 @@ function goDown() { let url = gScripts.selectedValue; if (url.indexOf("test-editor-mode") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -291,11 +292,11 @@ function goDown() { ok(false, "How did you get here?"); } }); - EventUtils.sendKey("DOWN"); + EventUtils.sendKey("DOWN", gDebugger); } function goDownAgain() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -313,7 +314,7 @@ function goDownAgain() { let url = gScripts.selectedValue; if (url.indexOf("test-script-switching-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -329,11 +330,11 @@ function goDownAgain() { ok(false, "How did you get here?"); } }); - EventUtils.synthesizeKey("g", { metaKey: true }); + EventUtils.synthesizeKey("g", { metaKey: true }, gDebugger); } function goDownAndWrap() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -351,7 +352,7 @@ function goDownAndWrap() { let url = gScripts.selectedValue; if (url.indexOf("update-editor-mode.html") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -367,11 +368,11 @@ function goDownAndWrap() { ok(false, "How did you get here?"); } }); - EventUtils.synthesizeKey("n", { ctrlKey: true }); + EventUtils.synthesizeKey("n", { ctrlKey: true }, gDebugger); } function goUpAndWrap() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -389,7 +390,7 @@ function goUpAndWrap() { let url = gScripts.selectedValue; if (url.indexOf("test-script-switching-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -405,11 +406,11 @@ function goUpAndWrap() { ok(false, "How did you get here?"); } }); - EventUtils.sendKey("UP"); + EventUtils.sendKey("UP", gDebugger); } function clickAndSwitch() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -427,7 +428,7 @@ function clickAndSwitch() { let url = gScripts.selectedValue; if (url.indexOf("update-editor-mode.html") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -447,7 +448,7 @@ function clickAndSwitch() { } function clickAndSwitchAgain() { - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -465,7 +466,7 @@ function clickAndSwitchAgain() { let url = gScripts.selectedValue; if (url.indexOf("test-script-switching-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); executeSoon(function() { info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); @@ -485,8 +486,8 @@ function clickAndSwitchAgain() { } function switchFocusWithEscape() { - window.addEventListener("popuphidden", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("popuphidden", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -508,12 +509,12 @@ function switchFocusWithEscape() { ok(false, "How did you get here?"); } }); - EventUtils.sendKey("ESCAPE"); + EventUtils.sendKey("ESCAPE", gDebugger); } function focusAgainAfterEscape() { - window.addEventListener("popupshown", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("popupshown", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -539,8 +540,8 @@ function focusAgainAfterEscape() { } function switchFocusWithReturn() { - window.addEventListener("popuphidden", function _onEvent(aEvent) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.addEventListener("popuphidden", function _onEvent(aEvent) { + gDebugger.removeEventListener(aEvent.type, _onEvent); info("Current script url:\n" + gScripts.selectedValue + "\n"); info("Debugger editor text:\n" + gEditor.getText() + "\n"); @@ -562,7 +563,7 @@ function switchFocusWithReturn() { ok(false, "How did you get here?"); } }); - EventUtils.sendKey("RETURN"); + EventUtils.sendKey("RETURN", gDebugger); } function clear() { @@ -577,7 +578,7 @@ function write(text) { function backspace(times) { for (let i = 0; i < times; i++) { - EventUtils.sendKey("BACK_SPACE") + EventUtils.sendKey("BACK_SPACE", gDebugger); } } @@ -585,7 +586,7 @@ function append(text) { gSearchBox.focus(); for (let i = 0; i < text.length; i++) { - EventUtils.sendChar(text[i]); + EventUtils.sendChar(text[i], gDebugger); } info("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n"); } diff --git a/browser/devtools/debugger/test/browser_dbg_stack-05.js b/browser/devtools/debugger/test/browser_dbg_stack-05.js index efa211f7559c..60bc5fdd6719 100644 --- a/browser/devtools/debugger/test/browser_dbg_stack-05.js +++ b/browser/devtools/debugger/test/browser_dbg_stack-05.js @@ -24,6 +24,15 @@ function test() { gPane = aPane; gDebugger = gPane.panelWin; + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + let url = aEvent.detail.url; + if (url.indexOf("-02.js") != -1) { + scriptShown = true; + gDebugger.removeEventListener(aEvent.type, _onEvent); + runTest(); + } + }); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; runTest(); @@ -32,15 +41,6 @@ function test() { gDebuggee.firstCall(); }); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { - let url = aEvent.detail.url; - if (url.indexOf("-02.js") != -1) { - scriptShown = true; - window.removeEventListener(aEvent.type, _onEvent); - runTest(); - } - }); - function runTest() { if (scriptShown && framesAdded) { diff --git a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js index 3e163206a7a8..b9c2452681a7 100644 --- a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js +++ b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js @@ -33,6 +33,8 @@ function test() gScripts = gDebugger.DebuggerView.Sources._container; resumed = true; + gDebugger.addEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() { framesAdded = true; executeSoon(startTest); @@ -48,12 +50,10 @@ function test() executeSoon(startTest); } - window.addEventListener("Debugger:SourceShown", onScriptShown); - function startTest() { if (scriptShown && framesAdded && resumed && !testStarted) { - window.removeEventListener("Debugger:SourceShown", onScriptShown); + gDebugger.removeEventListener("Debugger:SourceShown", onScriptShown); testStarted = true; Services.tm.currentThread.dispatch({ run: testScriptsDisplay }, 0); } @@ -73,10 +73,10 @@ function testScriptsDisplay() { ok(gDebugger.editor.getText().search(/debugger/) != -1, "The correct script was loaded initially."); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { let url = aEvent.detail.url; if (url.indexOf("switching-01.js") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); testSwitchPaused1(); } }); @@ -102,10 +102,10 @@ function testSwitchPaused1() is(gDebugger.editor.getMode(), SourceEditor.MODES.JAVASCRIPT, "Found the expected editor mode."); - window.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { + gDebugger.addEventListener("Debugger:SourceShown", function _onEvent(aEvent) { let url = aEvent.detail.url; if (url.indexOf("update-editor-mode") != -1) { - window.removeEventListener(aEvent.type, _onEvent); + gDebugger.removeEventListener(aEvent.type, _onEvent); testSwitchPaused2(); } }); diff --git a/browser/devtools/framework/ToolDefinitions.jsm b/browser/devtools/framework/ToolDefinitions.jsm index 69688926bff9..40cf52558c11 100644 --- a/browser/devtools/framework/ToolDefinitions.jsm +++ b/browser/devtools/framework/ToolDefinitions.jsm @@ -149,6 +149,7 @@ let profilerDefinition = { killswitch: "devtools.profiler.enabled", url: "chrome://browser/content/profiler.xul", label: l10n("profiler.label", profilerStrings), + icon: "chrome://browser/skin/devtools/tool-profiler.png", tooltip: l10n("profiler.tooltip", profilerStrings), isTargetSupported: function (target) { diff --git a/browser/devtools/styleeditor/StyleEditorChrome.jsm b/browser/devtools/styleeditor/StyleEditorChrome.jsm index c61d551943b0..a8da29eb837a 100644 --- a/browser/devtools/styleeditor/StyleEditorChrome.jsm +++ b/browser/devtools/styleeditor/StyleEditorChrome.jsm @@ -383,8 +383,10 @@ StyleEditorChrome.prototype = { } else { // If a line or column was specified we move the caret appropriately. aEditor.sourceEditor.setCaretPosition(line - 1, col - 1); - self._styleSheetToSelect = null; + this._styleSheetToSelect = null; } + } else { + this._styleSheetToSelect = null; } this._view.activeSummary = summary; diff --git a/browser/themes/gnomestripe/devtools/dock-bottom.png b/browser/themes/gnomestripe/devtools/dock-bottom.png index 83842f236ef5..8fa9c932bd9f 100644 Binary files a/browser/themes/gnomestripe/devtools/dock-bottom.png and b/browser/themes/gnomestripe/devtools/dock-bottom.png differ diff --git a/browser/themes/gnomestripe/devtools/dock-side.png b/browser/themes/gnomestripe/devtools/dock-side.png index 9a940bc1e4e5..1c12355138bd 100644 Binary files a/browser/themes/gnomestripe/devtools/dock-side.png and b/browser/themes/gnomestripe/devtools/dock-side.png differ diff --git a/browser/themes/gnomestripe/devtools/tool-profiler.png b/browser/themes/gnomestripe/devtools/tool-profiler.png new file mode 100644 index 000000000000..8f30f12a9d52 Binary files /dev/null and b/browser/themes/gnomestripe/devtools/tool-profiler.png differ diff --git a/browser/themes/gnomestripe/devtools/toolbox.css b/browser/themes/gnomestripe/devtools/toolbox.css index 21f037a91f8a..8394000614a8 100644 --- a/browser/themes/gnomestripe/devtools/toolbox.css +++ b/browser/themes/gnomestripe/devtools/toolbox.css @@ -67,7 +67,7 @@ .command-button:hover { background-color: hsla(206,37%,4%,.2); } -.command-button:hover:active { +.command-button:hover:active, .command-button[checked=true]:not(:hover) { background-color: hsla(206,37%,4%,.4); } diff --git a/browser/themes/gnomestripe/jar.mn b/browser/themes/gnomestripe/jar.mn index 5eab932a3019..653a9b0e38cc 100644 --- a/browser/themes/gnomestripe/jar.mn +++ b/browser/themes/gnomestripe/jar.mn @@ -182,6 +182,7 @@ browser.jar: skin/classic/browser/devtools/tool-debugger.png (devtools/tool-debugger.png) skin/classic/browser/devtools/tool-inspector.png (devtools/tool-inspector.png) skin/classic/browser/devtools/tool-styleeditor.png (devtools/tool-styleeditor.png) + skin/classic/browser/devtools/tool-profiler.png (devtools/tool-profiler.png) skin/classic/browser/devtools/close.png (devtools/close.png) skin/classic/browser/devtools/undock.png (devtools/undock.png) #ifdef MOZ_SERVICES_SYNC diff --git a/browser/themes/pinstripe/devtools/dock-bottom.png b/browser/themes/pinstripe/devtools/dock-bottom.png index 83842f236ef5..8fa9c932bd9f 100644 Binary files a/browser/themes/pinstripe/devtools/dock-bottom.png and b/browser/themes/pinstripe/devtools/dock-bottom.png differ diff --git a/browser/themes/pinstripe/devtools/dock-side.png b/browser/themes/pinstripe/devtools/dock-side.png index 9a940bc1e4e5..1c12355138bd 100644 Binary files a/browser/themes/pinstripe/devtools/dock-side.png and b/browser/themes/pinstripe/devtools/dock-side.png differ diff --git a/browser/themes/pinstripe/devtools/tool-profiler.png b/browser/themes/pinstripe/devtools/tool-profiler.png new file mode 100644 index 000000000000..8f30f12a9d52 Binary files /dev/null and b/browser/themes/pinstripe/devtools/tool-profiler.png differ diff --git a/browser/themes/pinstripe/devtools/toolbox.css b/browser/themes/pinstripe/devtools/toolbox.css index a7e7aa6e1288..fb62e68f3540 100644 --- a/browser/themes/pinstripe/devtools/toolbox.css +++ b/browser/themes/pinstripe/devtools/toolbox.css @@ -54,7 +54,7 @@ .command-button:hover { background-color: hsla(206,37%,4%,.2); } -.command-button:hover:active { +.command-button:hover:active, .command-button[checked=true]:not(:hover) { background-color: hsla(206,37%,4%,.4); } diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn index 0dbfc4feaa39..965bd2a44c52 100644 --- a/browser/themes/pinstripe/jar.mn +++ b/browser/themes/pinstripe/jar.mn @@ -253,6 +253,7 @@ browser.jar: skin/classic/browser/devtools/tool-debugger.png (devtools/tool-debugger.png) skin/classic/browser/devtools/tool-inspector.png (devtools/tool-inspector.png) skin/classic/browser/devtools/tool-styleeditor.png (devtools/tool-styleeditor.png) + skin/classic/browser/devtools/tool-profiler.png (devtools/tool-profiler.png) skin/classic/browser/devtools/close.png (devtools/close.png) skin/classic/browser/devtools/undock.png (devtools/undock.png) #ifdef MOZ_SERVICES_SYNC diff --git a/browser/themes/winstripe/devtools/dock-bottom.png b/browser/themes/winstripe/devtools/dock-bottom.png index 83842f236ef5..8fa9c932bd9f 100644 Binary files a/browser/themes/winstripe/devtools/dock-bottom.png and b/browser/themes/winstripe/devtools/dock-bottom.png differ diff --git a/browser/themes/winstripe/devtools/dock-side.png b/browser/themes/winstripe/devtools/dock-side.png index 9a940bc1e4e5..1c12355138bd 100644 Binary files a/browser/themes/winstripe/devtools/dock-side.png and b/browser/themes/winstripe/devtools/dock-side.png differ diff --git a/browser/themes/winstripe/devtools/tool-profiler.png b/browser/themes/winstripe/devtools/tool-profiler.png new file mode 100644 index 000000000000..8f30f12a9d52 Binary files /dev/null and b/browser/themes/winstripe/devtools/tool-profiler.png differ diff --git a/browser/themes/winstripe/devtools/toolbox.css b/browser/themes/winstripe/devtools/toolbox.css index b4c64d310bba..a274c0150b94 100644 --- a/browser/themes/winstripe/devtools/toolbox.css +++ b/browser/themes/winstripe/devtools/toolbox.css @@ -70,7 +70,7 @@ .command-button:hover { background-color: hsla(206,37%,4%,.2); } -.command-button:hover:active { +.command-button:hover:active, .command-button[checked=true]:not(:hover) { background-color: hsla(206,37%,4%,.4); } diff --git a/browser/themes/winstripe/jar.mn b/browser/themes/winstripe/jar.mn index 1a72ea04483d..0204bb3bfa1a 100644 --- a/browser/themes/winstripe/jar.mn +++ b/browser/themes/winstripe/jar.mn @@ -208,6 +208,7 @@ browser.jar: skin/classic/browser/devtools/tool-debugger.png (devtools/tool-debugger.png) skin/classic/browser/devtools/tool-inspector.png (devtools/tool-inspector.png) skin/classic/browser/devtools/tool-styleeditor.png (devtools/tool-styleeditor.png) + skin/classic/browser/devtools/tool-profiler.png (devtools/tool-profiler.png) skin/classic/browser/devtools/close.png (devtools/close.png) skin/classic/browser/devtools/undock.png (devtools/undock.png) #ifdef MOZ_SERVICES_SYNC @@ -429,6 +430,7 @@ browser.jar: skin/classic/aero/browser/devtools/tool-debugger.png (devtools/tool-debugger.png) skin/classic/aero/browser/devtools/tool-inspector.png (devtools/tool-inspector.png) skin/classic/aero/browser/devtools/tool-styleeditor.png (devtools/tool-styleeditor.png) + skin/classic/aero/browser/devtools/tool-profiler.png (devtools/tool-profiler.png) skin/classic/aero/browser/devtools/close.png (devtools/close.png) skin/classic/aero/browser/devtools/undock.png (devtools/undock.png) #ifdef MOZ_SERVICES_SYNC