Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1488381 - Use target.getFront to instantiate WebExtensionInspectedWindowFront; r=ochameau

Browse Source 
Depends on D6768

Differential Revision: https://phabricator.services.mozilla.com/D7063

--HG--
extra : moz-landing-system : lando
This commit is contained in:
yulia 2018-09-28 17:52:26 +00:00
parent 1f713970f4
commit 9809b1f863
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devtools/client/framework/devtools.js
View File

@ -16,9 +16,6 @@ loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm");
loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/framework/ToolboxProcess.jsm");
loader.lazyRequireGetter(this, "WebExtensionInspectedWindowFront",
"devtools/shared/fronts/addon/webextension-inspected-window", true);
const {defaultTools: DefaultTools, defaultThemes: DefaultThemes} =
require("devtools/client/definitions");
const EventEmitter = require("devtools/shared/event-emitter");
@ -626,7 +623,7 @@ DevTools.prototype = {
* browser/components/extensions/ext-devtools-inspectedWindow.js
*/
createWebExtensionInspectedWindowFront: function(tabTarget) {
return new WebExtensionInspectedWindowFront(tabTarget.client, tabTarget.form);
return tabTarget.getFront("webExtensionInspectedWindow");
},
/**

3
devtools/client/framework/target.js
View File

@ -364,7 +364,8 @@ TabTarget.prototype = {
// i.e. an actor served by RootActor.listTabs or RootActorActor.getTab requests
getFront(typeName) {
let front = this.fronts.get(typeName);
if (front) {
// the front might have been destroyed and no longer have an actor ID
if (front && front.actorID) {
return front;
}
front = getFront(this.client, typeName, this.form);

16
devtools/client/inspector/extensions/test/browser_inspector_extension_sidebar.js
View File

@ -7,12 +7,6 @@
ChromeUtils.defineModuleGetter(this, "ContentTaskUtils",
"resource://testing-common/ContentTaskUtils.jsm");
loader.lazyGetter(this, "WebExtensionInspectedWindowFront", () => {
return require(
"devtools/shared/fronts/addon/webextension-inspected-window"
).WebExtensionInspectedWindowFront;
}, true);
const SIDEBAR_ID = "an-extension-sidebar";
const SIDEBAR_TITLE = "Sidebar Title";
@ -113,10 +107,7 @@ add_task(async function testSidebarSetObject() {
});
add_task(async function testSidebarSetObjectValueGrip() {
const inspectedWindowFront = new WebExtensionInspectedWindowFront(
toolbox.target.client, toolbox.target.form
);
const inspectedWindowFront = toolbox.target.getFront("webExtensionInspectedWindow");
const sidebar = inspector.getPanel(SIDEBAR_ID);
const sidebarPanelContent = inspector.sidebar.getTabPanel(SIDEBAR_ID);
@ -158,10 +149,7 @@ add_task(async function testSidebarSetObjectValueGrip() {
});
add_task(async function testSidebarDOMNodeHighlighting() {
const inspectedWindowFront = new WebExtensionInspectedWindowFront(
toolbox.target.client, toolbox.target.form
);
const inspectedWindowFront = toolbox.target.getFront("webExtensionInspectedWindow");
const sidebar = inspector.getPanel(SIDEBAR_ID);
const sidebarPanelContent = inspector.sidebar.getTabPanel(SIDEBAR_ID);

12
devtools/server/tests/browser/browser_webextension_inspected_window.js
View File

@ -4,10 +4,6 @@
"use strict";
const {
WebExtensionInspectedWindowFront
} = require("devtools/shared/fronts/addon/webextension-inspected-window");
const TEST_RELOAD_URL = `${MAIN_DOMAIN}/inspectedwindow-reload-target.sjs`;
async function setup(pageUrl) {
@ -26,17 +22,15 @@ async function setup(pageUrl) {
addonId: extension.id,
};
await addTab(pageUrl);
initDebuggerServer();
const target = await addTabTarget(pageUrl);
const client = new DebuggerClient(DebuggerServer.connectPipe());
const form = await connectDebuggerClient(client);
const { client, form } = target;
const [, tabClient] = await client.attachTarget(form.actor);
const [, consoleClient] = await client.attachConsole(form.consoleActor, []);
const inspectedWindowFront = new WebExtensionInspectedWindowFront(client, form);
const inspectedWindowFront = target.getFront("webExtensionInspectedWindow");
return {
client, form,