Merge fx-team to m-c. a=merge (f8d2d47e) · Commits · The Tor Project / Applications / Tor Browser

browser/devtools/framework/gDevTools.jsm

+2 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,8 @@ DevTools.prototype = {
		// No toolbox for target, create one
		toolbox = new devtools.Toolbox(target, toolId, hostType, hostOptions);

		this.emit("toolbox-created", toolbox);

		this._toolboxes.set(target, toolbox);

		toolbox.once("destroy", () => {

browser/devtools/framework/test/browser.ini

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ skip-if = e10s # Bug 1069044 - destroyInspector may hang during shutdown
		[browser_toolbox_tabsswitch_shortcuts.js]
		[browser_toolbox_tool_ready.js]
		[browser_toolbox_tool_remote_reopen.js]
		[browser_toolbox_transport_events.js]
		[browser_toolbox_window_reload_target.js]
		[browser_toolbox_window_shortcuts.js]
		skip-if = os == "mac" && os_version == "10.8" \|\| os == "win" && os_version == "5.1" # Bug 851129 - Re-enable browser_toolbox_window_shortcuts.js test after leaks are fixed

browser/devtools/framework/test/browser_toolbox_transport_events.js

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		/* Any copyright is dedicated to the Public Domain.
		* http://creativecommons.org/publicdomain/zero/1.0/ */

		const { on, off } = devtools.require("sdk/event/core");
		const { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});

		function test() {
		gDevTools.on("toolbox-created", onToolboxCreated);
		on(DebuggerClient, "connect", onDebuggerClientConnect);

		addTab("about:blank").then(function() {
		let target = TargetFactory.forTab(gBrowser.selectedTab);
		gDevTools.showToolbox(target, "webconsole").then(testResults);
		});
		}

		function testResults(toolbox) {
		testPackets(sent1, received1);
		testPackets(sent2, received2);

		cleanUp(toolbox);
		}

		function cleanUp(toolbox) {
		gDevTools.off("toolbox-created", onToolboxCreated);
		off(DebuggerClient, "connect", onDebuggerClientConnect);

		toolbox.destroy().then(function() {
		gBrowser.removeCurrentTab();
		executeSoon(function() {
		finish();
		});
		});
		}

		function testPackets(sent, received) {
		ok(sent.length > 0, "There must be at least one sent packet");
		ok(received.length > 0, "There must be at leaset one received packet");

		if (!sent.length \|\| received.length) {
		return;
		}

		let sentPacket = sent[0];
		let receivedPacket = received[0];

		is(receivedPacket.from, "root",
		"The first received packet is from the root");
		is(receivedPacket.applicationType, "browser",
		"The first received packet has browser type");
		is(sentPacket.type, "listTabs",
		"The first sent packet is for list of tabs");
		}

		// Listen to the transport object that is associated with the
		// default Toolbox debugger client
		let sent1 = [];
		let received1 = [];

		function send1(eventId, packet) {
		sent1.push(packet);
		}

		function onPacket1(eventId, packet) {
		received1.push(packet);
		}

		function onToolboxCreated(eventId, toolbox) {
		toolbox.target.makeRemote();
		let client = toolbox.target.client;
		let transport = client._transport;

		transport.on("send", send1);
		transport.on("onPacket", onPacket1);

		client.addOneTimeListener("closed", event => {
		transport.off("send", send1);
		transport.off("onPacket", onPacket1);
		});
		}

		// Listen to all debugger client object protocols.
		let sent2 = [];
		let received2 = [];

		function send2(eventId, packet) {
		sent2.push(packet);
		}

		function onPacket2(eventId, packet) {
		received2.push(packet);
		}

		function onDebuggerClientConnect(client) {
		let transport = client._transport;

		transport.on("send", send2);
		transport.on("onPacket", onPacket2);

		client.addOneTimeListener("closed", event => {
		transport.off("send", send2);
		transport.off("onPacket", onPacket2);
		});
		}

browser/devtools/webconsole/test/browser_webconsole_assert.js

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,11 @@ function consoleOpened(hud) {
		return waitForMessages({
		webconsole: hud,
		messages: [{
		text: "undefined",
		category: CATEGORY_OUTPUT,
		severity: SEVERITY_LOG,
		},
		{
		text: "start",
		category: CATEGORY_WEBDEV,
		severity: SEVERITY_LOG,

browser/devtools/webconsole/test/test-network-request.html

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		}

		function testXhrWarn(aCallback) {
		makeXhr('get', 'http://example.com', null, aCallback);
		makeXhr('get', 'http://example.com/browser/browser/devtools/netmonitor/test/sjs_cors-test-server.sjs', null, aCallback);
		}

		function testXhrPost(aCallback) {