forked from Floorp-Projects/Floorp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge fx-team to mozilla-central a=merge
- Loading branch information
Showing
52 changed files
with
387 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
devtools/client/debugger/test/mochitest/browser_dbg_worker-console-01.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // Check to make sure that a worker can be attached to a toolbox | ||
| // and that the console works. | ||
|
|
||
| var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html"; | ||
| var WORKER_URL = "code_WorkerActor.attachThread-worker.js"; | ||
|
|
||
| add_task(function* testNormalExecution() { | ||
| let {client, tab, tabClient, workerClient, toolbox, gDebugger} = | ||
| yield initWorkerDebugger(TAB_URL, WORKER_URL); | ||
|
|
||
| let jsterm = yield getSplitConsole(toolbox); | ||
| let executed = yield jsterm.execute("this.location.toString()"); | ||
| ok(executed.textContent.includes(WORKER_URL), | ||
| "Evaluating the global's location works"); | ||
|
|
||
| terminateWorkerInTab(tab, WORKER_URL); | ||
| yield waitForWorkerClose(workerClient); | ||
| yield gDevTools.closeToolbox(TargetFactory.forWorker(workerClient)); | ||
| yield close(client); | ||
| yield removeTab(tab); | ||
| }); |
59 changes: 59 additions & 0 deletions
59
devtools/client/debugger/test/mochitest/browser_dbg_worker-console-02.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Check to make sure that a worker can be attached to a toolbox | ||
| // and that the console works. | ||
|
|
||
| var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html"; | ||
| var WORKER_URL = "code_WorkerActor.attachThread-worker.js"; | ||
|
|
||
| add_task(function* testWhilePaused() { | ||
| let {client, tab, tabClient, workerClient, toolbox, gDebugger} = | ||
| yield initWorkerDebugger(TAB_URL, WORKER_URL); | ||
|
|
||
| let gTarget = gDebugger.gTarget; | ||
| let gResumeButton = gDebugger.document.getElementById("resume"); | ||
| let gResumeKey = gDebugger.document.getElementById("resumeKey"); | ||
|
|
||
| // Execute some basic math to make sure evaluations are working. | ||
| let jsterm = yield getSplitConsole(toolbox); | ||
| let executed = yield jsterm.execute("10000+1"); | ||
| ok(executed.textContent.includes("10001"), "Text for message appeared correct"); | ||
|
|
||
| // Pause the worker by waiting for next execution and then sending a message to | ||
| // it from the main thread. | ||
| let oncePaused = gTarget.once("thread-paused"); | ||
| EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger); | ||
| once(gDebugger.gClient, "willInterrupt").then(() => { | ||
| info("Posting message to worker, then waiting for a pause"); | ||
| postMessageToWorkerInTab(tab, WORKER_URL, "ping"); | ||
| }); | ||
| yield oncePaused; | ||
|
|
||
| let command1 = jsterm.execute("10000+2"); | ||
| let command2 = jsterm.execute("10000+3"); | ||
| let command3 = jsterm.execute("foobar"); // throw an error | ||
|
|
||
| info("Trying to get the result of command1"); | ||
| executed = yield command1; | ||
| ok(executed.textContent.includes("10002"), | ||
| "command1 executed successfully"); | ||
|
|
||
| info("Trying to get the result of command2"); | ||
| executed = yield command2; | ||
| ok(executed.textContent.includes("10003"), | ||
| "command2 executed successfully"); | ||
|
|
||
| info("Trying to get the result of command3"); | ||
| executed = yield command3; | ||
| // XXXworkers This is failing until Bug 1215120 is resolved. | ||
| todo(executed.textContent.includes("ReferenceError: foobar is not defined"), | ||
| "command3 executed successfully"); | ||
|
|
||
| let onceResumed = gTarget.once("thread-resumed"); | ||
| EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger); | ||
| yield onceResumed; | ||
|
|
||
| terminateWorkerInTab(tab, WORKER_URL); | ||
| yield waitForWorkerClose(workerClient); | ||
| yield gDevTools.closeToolbox(TargetFactory.forWorker(workerClient)); | ||
| yield close(client); | ||
| yield removeTab(tab); | ||
| }); |
46 changes: 46 additions & 0 deletions
46
devtools/client/debugger/test/mochitest/browser_dbg_worker-console-03.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Check to make sure that a worker can be attached to a toolbox | ||
| // and that the console works. | ||
|
|
||
| var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html"; | ||
| var WORKER_URL = "code_WorkerActor.attachThread-worker.js"; | ||
|
|
||
| // Test to see if creating the pause from the console works. | ||
| add_task(function* testPausedByConsole() { | ||
| let {client, tab, tabClient, workerClient, toolbox, gDebugger} = | ||
| yield initWorkerDebugger(TAB_URL, WORKER_URL); | ||
|
|
||
| let gTarget = gDebugger.gTarget; | ||
| let gResumeButton = gDebugger.document.getElementById("resume"); | ||
| let gResumeKey = gDebugger.document.getElementById("resumeKey"); | ||
|
|
||
| let jsterm = yield getSplitConsole(toolbox); | ||
| let executed = yield jsterm.execute("10000+1"); | ||
| ok(executed.textContent.includes("10001"), | ||
| "Text for message appeared correct"); | ||
|
|
||
| let oncePaused = gTarget.once("thread-paused"); | ||
| EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger); | ||
| let pausedExecution = jsterm.execute("10000+2"); | ||
|
|
||
| info("Executed a command with 'break on next' active, waiting for pause"); | ||
| yield oncePaused; | ||
|
|
||
| executed = yield jsterm.execute("10000+3"); | ||
| ok(executed.textContent.includes("10003"), | ||
| "Text for message appeared correct"); | ||
|
|
||
| info("Waiting for a resume"); | ||
| let onceResumed = gTarget.once("thread-resumed"); | ||
| EventUtils.sendMouseEvent({ type: "mousedown" }, gResumeButton, gDebugger); | ||
| yield onceResumed; | ||
|
|
||
| executed = yield pausedExecution; | ||
| ok(executed.textContent.includes("10002"), | ||
| "Text for message appeared correct"); | ||
|
|
||
| terminateWorkerInTab(tab, WORKER_URL); | ||
| yield waitForWorkerClose(workerClient); | ||
| yield gDevTools.closeToolbox(TargetFactory.forWorker(workerClient)); | ||
| yield close(client); | ||
| yield removeTab(tab); | ||
| }); |
Oops, something went wrong.