mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 912121 - Rewrite require / import to match source tree. rs=devtools 

In a following patch, all DevTools moz.build files will use DevToolsModules to
install JS modules at a path that corresponds directly to their source tree
location.  Here we rewrite all require and import calls to match the new
location that these files are installed to.

--HG--
extra : commitid : F2ItGm8ptRz
extra : rebase_source : b082fe4bf77e22e297e303fc601165ceff1c4cbc
This commit is contained in:
J. Ryan Stinnett 2015-09-21 12:04:18 -05:00
Родитель 84629e2b5e
Коммит efe328f1b2
786 изменённых файлов: 2673 добавлений и 2406 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
addon-sdk/source/lib/dev/debuggee.js
Просмотреть файл

@ -11,7 +11,7 @@ module.metadata = {
const { Cu } = require("chrome");
const { Class } = require("../sdk/core/heritage");
const { MessagePort, MessageChannel } = require("../sdk/messaging");
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { DebuggerServer } = devtoolsRequire("devtools/server/main");
const outputs = new WeakMap();

2
addon-sdk/source/lib/dev/toolbox.js
Просмотреть файл

@ -15,7 +15,7 @@ const { contract, validate } = require("../sdk/util/contract");
const { each, pairs, values } = require("../sdk/util/sequence");
const { onEnable, onDisable } = require("../dev/theme/hooks");
const { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
const { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
// This is temporary workaround to allow loading of the developer tools client - volcan
// into a toolbox panel, this hack won't be necessary as soon as devtools patch will be

4
addon-sdk/source/lib/dev/utils.js
Просмотреть файл

@ -5,8 +5,8 @@
"use strict";
const { Cu } = require("chrome");
const { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
const { devtools } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { getActiveTab } = require("../sdk/tabs/utils");
const { getMostRecentBrowserWindow } = require("../sdk/window/utils");

2
addon-sdk/source/lib/sdk/addon/runner.js
Просмотреть файл

@ -24,7 +24,7 @@ const Startup = Cu.import("resource://gre/modules/sdk/system/Startup.js", {}).ex
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function () {
return Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", {}).
return Cu.import("resource:///modules/devtools/client/framework/ToolboxProcess.jsm", {}).
BrowserToolboxProcess;
});

2
addon-sdk/source/lib/sdk/console/plain-text.js
Просмотреть файл

@ -12,7 +12,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
const self = require("../self");
const prefs = require("../preferences/service");
const { merge } = require("../util/object");
const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
const DEFAULT_LOG_LEVEL = "error";
const ADDON_LOG_LEVEL_PREF = "extensions." + self.id + ".sdk.console.logLevel";

2
addon-sdk/source/lib/sdk/loader/sandbox.js
Просмотреть файл

@ -15,7 +15,7 @@ const self = require('sdk/self');
const { getTabId, getTabForContentWindow } = require('../tabs/utils');
const { getInnerId } = require('../window/utils');
const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { devtools } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { require: devtoolsRequire } = devtools;
const { addContentGlobal, removeContentGlobal } = devtoolsRequire("devtools/server/content-globals");

2
addon-sdk/source/lib/toolkit/loader.js
Просмотреть файл

@ -798,7 +798,7 @@ function Loader(options) {
globals: {
get console() {
// Import Console.jsm from here to prevent loading it until someone uses it
let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm");
let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm");
let console = new ConsoleAPI({
consoleID: options.id ? "addon/" + options.id : ""
});

4
addon-sdk/source/test/addons/page-mod-debugger-post/main.js
Просмотреть файл

@ -12,9 +12,9 @@ const { getMostRecentBrowserWindow } = require('sdk/window/utils');
const { data } = require('sdk/self');
const { set } = require('sdk/preferences/service');
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { DebuggerServer } = devtoolsRequire("devtools/server/main");
const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main");
const { DebuggerClient } = devtoolsRequire("devtools/shared/client/main");
var gClient;
var ok;

4
addon-sdk/source/test/addons/page-mod-debugger-pre/main.js
Просмотреть файл

@ -12,9 +12,9 @@ const { getMostRecentBrowserWindow } = require('sdk/window/utils');
const { data } = require('sdk/self');
const { set } = require('sdk/preferences/service');
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { DebuggerServer } = devtoolsRequire("devtools/server/main");
const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main");
const { DebuggerClient } = devtoolsRequire("devtools/shared/client/main");
var gClient;
var ok;

2
addon-sdk/source/test/test-page-mod-debug.js
Просмотреть файл

@ -10,7 +10,7 @@ const { testPageMod, handleReadyState, openNewTab,
const { cleanUI, after } = require("sdk/test/utils");
const { open, getFrames, getMostRecentBrowserWindow, getInnerId } = require("sdk/window/utils");
const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { devtools } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { require: devtoolsRequire } = devtools;
const contentGlobals = devtoolsRequire("devtools/server/content-globals");

2
addon-sdk/test/head.js
Просмотреть файл

@ -5,7 +5,7 @@
const { utils: Cu } = Components;
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const LoaderModule = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {}).Loader;
const { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
const { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
var {
Loader, main, Module, Require, unload
} = LoaderModule;

10
b2g/chrome/content/desktop.js
Просмотреть файл

@ -8,9 +8,9 @@ var isMulet = "ResponsiveUI" in browserWindow;
// Enable touch event shim on desktop that translates mouse events
// into touch ones
function enableTouch() {
let require = Cu.import('resource://gre/modules/devtools/Loader.jsm', {})
let require = Cu.import('resource://gre/modules/devtools/shared/Loader.jsm', {})
.devtools.require;
let { TouchEventSimulator } = require('devtools/toolkit/touch/simulator');
let { TouchEventSimulator } = require('devtools/shared/touch/simulator');
let touchEventSimulator = new TouchEventSimulator(shell.contentBrowser);
touchEventSimulator.start();
}
@ -108,7 +108,7 @@ function checkDebuggerPort() {
function initResponsiveDesign() {
Cu.import('resource:///modules/devtools/responsivedesign.jsm');
Cu.import('resource:///modules/devtools/client/responsivedesign/responsivedesign.jsm');
ResponsiveUIManager.on('on', function(event, {tab:tab}) {
let responsive = ResponsiveUIManager.getResponsiveUIForTab(tab);
let document = tab.ownerDocument;
@ -154,8 +154,8 @@ function openDevtools() {
Services.prefs.setIntPref('devtools.toolbox.sidebar.width',
browserWindow.outerWidth - 550);
Services.prefs.setCharPref('devtools.toolbox.host', 'side');
let {gDevTools} = Cu.import('resource:///modules/devtools/gDevTools.jsm', {});
let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
let {gDevTools} = Cu.import('resource:///modules/devtools/client/framework/gDevTools.jsm', {});
let {devtools} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
let target = devtools.TargetFactory.forTab(browserWindow.gBrowser.selectedTab);
gDevTools.showToolbox(target);
}

6
b2g/chrome/content/devtools/debugger.js
Просмотреть файл

@ -8,7 +8,7 @@
XPCOMUtils.defineLazyGetter(this, "devtools", function() {
const { devtools } =
Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
return devtools;
});
@ -26,7 +26,7 @@ XPCOMUtils.defineLazyGetter(this, "B2GTabList", function() {
// Load the discovery module eagerly, so that it can set a device name at
// startup. This does not cause discovery to start listening for packets, as
// that only happens once DevTools is enabled.
devtools.require("devtools/toolkit/discovery/discovery");
devtools.require("devtools/shared/discovery/discovery");
var RemoteDebugger = {
_listening: false,
@ -103,7 +103,7 @@ var RemoteDebugger = {
}
this._listen();
const QR = devtools.require("devtools/toolkit/qrcode/index");
const QR = devtools.require("devtools/shared/qrcode/index");
this._receivingOOB = new Promise((resolve, reject) => {
this._handleAuthEvent = detail => {
debug(detail.action);

6
b2g/chrome/content/devtools/hud.js
Просмотреть файл

@ -10,16 +10,16 @@ const DEVELOPER_HUD_LOG_PREFIX = 'DeveloperHUD';
const CUSTOM_HISTOGRAM_PREFIX = 'DEVTOOLS_HUD_CUSTOM_';
XPCOMUtils.defineLazyGetter(this, 'devtools', function() {
const {devtools} = Cu.import('resource://gre/modules/devtools/Loader.jsm', {});
const {devtools} = Cu.import('resource://gre/modules/devtools/shared/Loader.jsm', {});
return devtools;
});
XPCOMUtils.defineLazyGetter(this, 'DebuggerClient', function() {
return devtools.require('devtools/toolkit/client/main').DebuggerClient;
return devtools.require('devtools/shared/client/main').DebuggerClient;
});
XPCOMUtils.defineLazyGetter(this, 'WebConsoleUtils', function() {
return devtools.require('devtools/toolkit/webconsole/utils').Utils;
return devtools.require('devtools/shared/webconsole/utils').Utils;
});
XPCOMUtils.defineLazyGetter(this, 'EventLoopLagFront', function() {

2
b2g/components/DebuggerActors.js
Просмотреть файл

@ -7,7 +7,7 @@
"use strict";
const { Cu } = require("chrome");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const promise = require("promise");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
const { BrowserTabList } = require("devtools/server/actors/webbrowser");

2
b2g/simulator/bootstrap.js поставляемый
Просмотреть файл

@ -31,7 +31,7 @@ function startup(data, reason) {
Cu.import('resource://gre/modules/commonjs/toolkit/loader.js').Loader;
let { Loader, Require, Main } = loaderModule;
const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm");
const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm");
let loader = Loader({
paths: {

2
b2g/simulator/lib/main.js
Просмотреть файл

@ -8,7 +8,7 @@ const { Cc, Ci, Cu } = require("chrome");
const { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { Simulator } = Cu.import("resource://gre/modules/devtools/Simulator.jsm");
const { Simulator } = Cu.import("resource://gre/modules/devtools/shared/apps/Simulator.jsm");
const { SimulatorProcess } = require("./simulator-process");
const Runtime = require("sdk/system/runtime");
const URL = require("sdk/url");

2
b2g/simulator/lib/simulator-process.js
Просмотреть файл

@ -13,7 +13,7 @@ const Environment = require("sdk/system/environment").env;
const Runtime = require("sdk/system/runtime");
const Subprocess = require("sdk/system/child_process/subprocess");
const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
const { EventEmitter } = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
const { EventEmitter } = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js", {});
// Log subprocess error and debug messages to the console. This logs messages

20
browser/base/content/browser.js
Просмотреть файл

@ -181,13 +181,13 @@ XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function () {
XPCOMUtils.defineLazyGetter(this, "DeveloperToolbar", function() {
let tmp = {};
Cu.import("resource:///modules/devtools/DeveloperToolbar.jsm", tmp);
Cu.import("resource:///modules/devtools/client/shared/DeveloperToolbar.jsm", tmp);
return new tmp.DeveloperToolbar(window, document.getElementById("developer-toolbar"));
});
XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function() {
let tmp = {};
Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", tmp);
Cu.import("resource:///modules/devtools/client/framework/ToolboxProcess.jsm", tmp);
return tmp.BrowserToolboxProcess;
});
@ -7689,15 +7689,15 @@ var TabContextMenu = {
};
XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
"resource:///modules/devtools/gDevTools.jsm");
"resource:///modules/devtools/client/framework/gDevTools.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "gDevToolsBrowser",
"resource:///modules/devtools/gDevTools.jsm");
"resource:///modules/devtools/client/framework/gDevTools.jsm");
Object.defineProperty(this, "HUDService", {
get: function HUDService_getter() {
let devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
return devtools.require("devtools/webconsole/hudservice");
let devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
return devtools.require("devtools/client/webconsole/hudservice");
},
configurable: true,
enumerable: true
@ -7768,7 +7768,7 @@ var Scratchpad = {
XPCOMUtils.defineLazyGetter(Scratchpad, "ScratchpadManager", function() {
let tmp = {};
Cu.import("resource:///modules/devtools/scratchpad-manager.jsm", tmp);
Cu.import("resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm", tmp);
return tmp.ScratchpadManager;
});
@ -7780,7 +7780,7 @@ var ResponsiveUI = {
XPCOMUtils.defineLazyGetter(ResponsiveUI, "ResponsiveUIManager", function() {
let tmp = {};
Cu.import("resource:///modules/devtools/responsivedesign.jsm", tmp);
Cu.import("resource:///modules/devtools/client/responsivedesign/responsivedesign.jsm", tmp);
return tmp.ResponsiveUIManager;
});
@ -7792,8 +7792,8 @@ function openEyedropper() {
Object.defineProperty(this, "Eyedropper", {
get: function() {
let devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
return devtools.require("devtools/eyedropper/eyedropper").Eyedropper;
let devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
return devtools.require("devtools/client/eyedropper/eyedropper").Eyedropper;
},
configurable: true,
enumerable: true

2
browser/base/content/nsContextMenu.js
Просмотреть файл

@ -555,7 +555,7 @@ nsContextMenu.prototype = {
},
inspectNode: function CM_inspectNode() {
let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
let {devtools} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
let gBrowser = this.browser.ownerDocument.defaultView.gBrowser;
let tt = devtools.TargetFactory.forTab(gBrowser.selectedTab);
return gDevTools.showToolbox(tt, "inspector").then(function(toolbox) {

2
browser/components/customizableui/logging.js
Просмотреть файл

@ -5,7 +5,7 @@
#endif
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
var gDebug = false;
try {

2
browser/components/downloads/DownloadsCommon.jsm
Просмотреть файл

@ -64,7 +64,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm");
XPCOMUtils.defineLazyGetter(this, "DownloadsLogger", () => {
let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
let { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
let consoleOptions = {
maxLogLevelPref: "browser.download.loglevel",
prefix: "Downloads"

2
browser/components/extensions/ext-browserAction.js
Просмотреть файл

@ -1,7 +1,7 @@
XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm");
Cu.import("resource://gre/modules/devtools/event-emitter.js");
Cu.import("resource://gre/modules/devtools/shared/event-emitter.js");
Cu.import("resource://gre/modules/ExtensionUtils.jsm");
var {

4
browser/components/loop/modules/LoopContacts.jsm
Просмотреть файл

@ -7,7 +7,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "LoopStorage",
"resource:///modules/loop/LoopStorage.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "CardDavImporter",
XPCOMUtils.defineLazyModuleGetter(this, "GoogleImporter",
"resource:///modules/loop/GoogleImporter.jsm");
XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js", {});
return new EventEmitter();
});

2
browser/components/loop/modules/LoopRooms.jsm
Просмотреть файл

@ -19,7 +19,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
"resource://gre/modules/WebChannel.jsm");
XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js", {});
return new EventEmitter();
});
XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {

2
browser/components/loop/modules/LoopStorage.jsm
Просмотреть файл

@ -19,7 +19,7 @@ try {
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js", {});
return new EventEmitter();
});

2
browser/components/loop/modules/MozLoopService.jsm
Просмотреть файл

@ -164,7 +164,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gWM",
// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
XPCOMUtils.defineLazyGetter(this, "log", () => {
let ConsoleAPI = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).ConsoleAPI;
let ConsoleAPI = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).ConsoleAPI;
let consoleOptions = {
maxLogLevelPref: PREF_LOG_LEVEL,
prefix: "Loop"

2
browser/components/sessionstore/SessionFile.jsm
Просмотреть файл

@ -38,7 +38,7 @@ Cu.import("resource://gre/modules/AsyncShutdown.jsm");
Cu.import("resource://gre/modules/Preferences.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "RunState",
"resource:///modules/sessionstore/RunState.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",

2
browser/components/sessionstore/SessionSaver.jsm
Просмотреть файл

@ -18,7 +18,7 @@ Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
"resource://gre/modules/AppConstants.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter",
"resource:///modules/sessionstore/PrivacyFilter.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",

2
browser/components/sessionstore/SessionStorage.jsm
Просмотреть файл

@ -14,7 +14,7 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
// Returns the principal for a given |frame| contained in a given |docShell|.
function getPrincipalForFrame(docShell, frame) {

4
browser/components/sessionstore/SessionStore.jsm
Просмотреть файл

@ -128,7 +128,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gScreenManager",
XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
"@mozilla.org/base/telemetry;1", "nsITelemetry");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
"resource:///modules/RecentWindow.jsm");
@ -141,7 +141,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter",
XPCOMUtils.defineLazyModuleGetter(this, "RunState",
"resource:///modules/sessionstore/RunState.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "ScratchpadManager",
"resource:///modules/devtools/scratchpad-manager.jsm");
"resource:///modules/devtools/client/scratchpad/scratchpad-manager.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SessionSaver",
"resource:///modules/sessionstore/SessionSaver.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SessionCookies",

2
browser/components/sessionstore/TabState.jsm
Просмотреть файл

@ -13,7 +13,7 @@ Cu.import("resource://gre/modules/Promise.jsm", this);
Cu.import("resource://gre/modules/Task.jsm", this);
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter",
"resource:///modules/sessionstore/PrivacyFilter.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TabStateCache",

2
browser/components/sessionstore/nsSessionStartup.js
Просмотреть файл

@ -42,7 +42,7 @@ Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/devtools/Console.jsm");
"resource://gre/modules/devtools/shared/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SessionFile",
"resource:///modules/sessionstore/SessionFile.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "CrashMonitor",

2
browser/components/uitour/UITour.jsm
Просмотреть файл

@ -73,7 +73,7 @@ const TARGET_SEARCHENGINE_PREFIX = "searchEngine-";
// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
XPCOMUtils.defineLazyGetter(this, "log", () => {
let ConsoleAPI = Cu.import("resource://gre/modules/devtools/Console.jsm", {}).ConsoleAPI;
let ConsoleAPI = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {}).ConsoleAPI;
let consoleOptions = {
maxLogLevelPref: PREF_LOG_LEVEL,
prefix: "UITour",

8
devtools/client/animationinspector/animation-controller.js
Просмотреть файл

@ -11,13 +11,13 @@
const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
Cu.import("resource://gre/modules/Task.jsm");
var { loader, require } = Cu.import("resource://gre/modules/devtools/Loader.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
var { loader, require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm");
Cu.import("resource://gre/modules/devtools/shared/Console.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
loader.lazyRequireGetter(this, "promise");
loader.lazyRequireGetter(this, "EventEmitter",
"devtools/toolkit/event-emitter");
"devtools/shared/event-emitter");
loader.lazyRequireGetter(this, "AnimationsFront",
"devtools/server/actors/animation", true);

2
devtools/client/animationinspector/animation-panel.js
Просмотреть файл

@ -8,7 +8,7 @@
"use strict";
const {AnimationsTimeline} = require("devtools/animationinspector/components");
const {AnimationsTimeline} = require("devtools/client/animationinspector/components");
/**
* The main animations panel UI.

4
devtools/client/animationinspector/components.js
Просмотреть файл

@ -21,13 +21,13 @@
// c.destroy();
const {Cu} = require("chrome");
Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
const {Task} = Cu.import("resource://gre/modules/Task.jsm", {});
const {
createNode,
drawGraphElementBackground,
findOptimalTimeInterval
} = require("devtools/animationinspector/utils");
} = require("devtools/client/animationinspector/utils");
const STRINGS_URI = "chrome://browser/locale/devtools/animationinspector.properties";
const L10N = new ViewHelpers.L10N(STRINGS_URI);

4
devtools/client/animationinspector/moz.build
Просмотреть файл

@ -7,7 +7,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
EXTRA_JS_MODULES.devtools.animationinspector += [
DevToolsModules(
'components.js',
'utils.js',
]
)

4
devtools/client/animationinspector/test/browser_animation_timeline_header.js
Просмотреть файл

@ -6,8 +6,8 @@
// Check that the timeline shows correct time graduations in the header.
const {findOptimalTimeInterval} = require("devtools/animationinspector/utils");
const {TimeScale} = require("devtools/animationinspector/components");
const {findOptimalTimeInterval} = require("devtools/client/animationinspector/utils");
const {TimeScale} = require("devtools/client/animationinspector/components");
// Should be kept in sync with TIME_GRADUATION_MIN_SPACING in components.js
const TIME_GRADUATION_MIN_SPACING = 40;

12
devtools/client/animationinspector/test/head.js
Просмотреть файл

@ -5,13 +5,13 @@
"use strict";
const Cu = Components.utils;
const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const promise = require("promise");
const {TargetFactory} = require("devtools/framework/target");
const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
const {ViewHelpers} = Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const {TargetFactory} = require("devtools/client/framework/target");
const {console} = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
const {ViewHelpers} = Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm", {});
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
// All tests are asynchronous
waitForExplicitFinish();

4
devtools/client/animationinspector/test/unit/test_findOptimalTimeInterval.js
Просмотреть файл

@ -7,8 +7,8 @@
"use strict";
const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {findOptimalTimeInterval} = require("devtools/animationinspector/utils");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {findOptimalTimeInterval} = require("devtools/client/animationinspector/utils");
// This test array contains objects that are used to test the
// findOptimalTimeInterval function. Each object should have the following

4
devtools/client/animationinspector/test/unit/test_timeScale.js
Просмотреть файл

@ -6,8 +6,8 @@
"use strict";
const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {TimeScale} = require("devtools/animationinspector/components");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {TimeScale} = require("devtools/client/animationinspector/components");
const TEST_ANIMATIONS = [{
desc: "Testing a few standard animations",

6
devtools/client/app-manager/app-projects.js
Просмотреть файл

@ -1,8 +1,8 @@
const {Cc,Ci,Cu,Cr} = require("chrome");
const ObservableObject = require("devtools/shared/observable-object");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
const ObservableObject = require("devtools/client/shared/observable-object");
const promise = require("devtools/shared/deprecated-sync-thenables");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js");
const {generateUUID} = Cc['@mozilla.org/uuid-generator;1'].getService(Ci.nsIUUIDGenerator);
const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm");
const { indexedDB } = require("sdk/indexed-db");

2
devtools/client/app-manager/app-validator.js
Просмотреть файл

@ -4,7 +4,7 @@
"use strict";
var {Ci,Cu,CC} = require("chrome");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
const promise = require("devtools/shared/deprecated-sync-thenables");
const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm");
const {Services} = Cu.import("resource://gre/modules/Services.jsm");

4
devtools/client/app-manager/builtin-adb-store.js
Просмотреть файл

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const {Cu} = require("chrome");
const ObservableObject = require("devtools/shared/observable-object");
const {Devices} = Cu.import("resource://gre/modules/devtools/Devices.jsm");
const ObservableObject = require("devtools/client/shared/observable-object");
const {Devices} = Cu.import("resource://gre/modules/devtools/shared/apps/Devices.jsm");
var store = new ObservableObject({versions:[]});

4
devtools/client/app-manager/connection-store.js
Просмотреть файл

@ -2,8 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const ObservableObject = require("devtools/shared/observable-object");
const {Connection} = require("devtools/client/connection-manager");
const ObservableObject = require("devtools/client/shared/observable-object");
const {Connection} = require("devtools/shared/client/connection-manager");
const _knownConnectionStores = new WeakMap();

18
devtools/client/app-manager/content/connection-footer.js
Просмотреть файл

@ -5,18 +5,18 @@
const Cu = Components.utils;
const Ci = Components.interfaces;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/devtools/gDevTools.jsm");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {Simulator} = Cu.import("resource://gre/modules/devtools/Simulator.jsm")
const {Devices} = Cu.import("resource://gre/modules/devtools/Devices.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {Simulator} = Cu.import("resource://gre/modules/devtools/shared/apps/Simulator.jsm")
const {Devices} = Cu.import("resource://gre/modules/devtools/shared/apps/Devices.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
const {ConnectionManager, Connection} = require("devtools/shared/client/connection-manager");
const {getDeviceFront} = require("devtools/server/actors/device");
const ConnectionStore = require("devtools/app-manager/connection-store");
const DeviceStore = require("devtools/app-manager/device-store");
const simulatorsStore = require("devtools/app-manager/simulators-store");
const adbStore = require("devtools/app-manager/builtin-adb-store");
const ConnectionStore = require("devtools/client/app-manager/connection-store");
const DeviceStore = require("devtools/client/app-manager/device-store");
const simulatorsStore = require("devtools/client/app-manager/simulators-store");
const adbStore = require("devtools/client/app-manager/builtin-adb-store");
window.addEventListener("unload", function onUnload() {
window.removeEventListener("unload", onUnload);

16
devtools/client/app-manager/content/device.js
Просмотреть файл

@ -4,19 +4,19 @@
const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
const {gDevTools} = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {TargetFactory} = require("devtools/framework/target");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {TargetFactory} = require("devtools/client/framework/target");
const {ConnectionManager, Connection}
= require("devtools/client/connection-manager");
= require("devtools/shared/client/connection-manager");
const {getDeviceFront} = require("devtools/server/actors/device");
const {getTargetForApp, launchApp, closeApp}
= require("devtools/app-actor-front");
const DeviceStore = require("devtools/app-manager/device-store");
const WebappsStore = require("devtools/app-manager/webapps-store");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
= require("devtools/shared/apps/app-actor-front");
const DeviceStore = require("devtools/client/app-manager/device-store");
const WebappsStore = require("devtools/client/app-manager/webapps-store");
const promise = require("devtools/shared/deprecated-sync-thenables");
const DEFAULT_APP_ICON = "chrome://browser/skin/devtools/app-manager/default-app-icon.png";
window.addEventListener("message", function(event) {

10
devtools/client/app-manager/content/index.js
Просмотреть файл

@ -3,11 +3,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const {utils: Cu, interfaces: Ci} = Components;
Cu.import("resource:///modules/devtools/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {Toolbox} = require("devtools/framework/toolbox");
const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {Toolbox} = require("devtools/client/framework/toolbox");
const {ConnectionManager, Connection} = require("devtools/shared/client/connection-manager");
const promise = require("devtools/shared/deprecated-sync-thenables");
const prefs = require("sdk/preferences/service");
const Services = require("Services");
const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/app-manager.properties");

2
devtools/client/app-manager/content/manifest-editor.js
Просмотреть файл

@ -5,7 +5,7 @@
Cu.import("resource://gre/modules/osfile.jsm");
const {VariablesView} =
Cu.import("resource:///modules/devtools/VariablesView.jsm", {});
Cu.import("resource:///modules/devtools/client/shared/widgets/VariablesView.jsm", {});
const VARIABLES_VIEW_URL =
"chrome://devtools/content/shared/widgets/VariablesView.xul";

16
devtools/client/app-manager/content/projects.js
Просмотреть файл

@ -6,18 +6,18 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
const Cr = Components.results;
Cu.import("resource:///modules/devtools/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
const {AppProjects} = require("devtools/app-manager/app-projects");
const {AppValidator} = require("devtools/app-manager/app-validator");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {ConnectionManager, Connection} = require("devtools/shared/client/connection-manager");
const {AppProjects} = require("devtools/client/app-manager/app-projects");
const {AppValidator} = require("devtools/client/app-manager/app-validator");
const {Services} = Cu.import("resource://gre/modules/Services.jsm");
const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm");
const {installHosted, installPackaged, getTargetForApp,
reloadApp, launchApp, closeApp} = require("devtools/app-actor-front");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js");
reloadApp, launchApp, closeApp} = require("devtools/shared/apps/app-actor-front");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
const promise = require("devtools/shared/deprecated-sync-thenables");
const MANIFEST_EDITOR_ENABLED = "devtools.appmanager.manifestEditor.enabled";

4
devtools/client/app-manager/content/utils.js
Просмотреть файл

@ -14,8 +14,8 @@
var Utils = (function() {
const Cu = Components.utils;
const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const EventEmitter = require("devtools/toolkit/event-emitter");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const EventEmitter = require("devtools/shared/event-emitter");
function _createSetEventForwarder(key, finalStore) {

4
devtools/client/app-manager/device-store.js
Просмотреть файл

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const ObservableObject = require("devtools/shared/observable-object");
const ObservableObject = require("devtools/client/shared/observable-object");
const {getDeviceFront} = require("devtools/server/actors/device");
const {Connection} = require("devtools/client/connection-manager");
const {Connection} = require("devtools/shared/client/connection-manager");
const {Cu} = require("chrome");

4
devtools/client/app-manager/moz.build
Просмотреть файл

@ -7,7 +7,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
EXTRA_JS_MODULES.devtools["app-manager"] += [
DevToolsModules(
'app-projects.js',
'app-validator.js',
'builtin-adb-store.js',
@ -15,4 +15,4 @@ EXTRA_JS_MODULES.devtools["app-manager"] += [
'device-store.js',
'simulators-store.js',
'webapps-store.js',
]
)

4
devtools/client/app-manager/simulators-store.js
Просмотреть файл

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const {Cu} = require("chrome");
const ObservableObject = require("devtools/shared/observable-object");
const {Simulator} = Cu.import("resource://gre/modules/devtools/Simulator.jsm");
const ObservableObject = require("devtools/client/shared/observable-object");
const {Simulator} = Cu.import("resource://gre/modules/devtools/shared/apps/Simulator.jsm");
var store = new ObservableObject({versions:[]});

8
devtools/client/app-manager/test/head.js
Просмотреть файл

@ -5,12 +5,12 @@
const {utils: Cu, classes: Cc, interfaces: Ci} = Components;
const {Promise: promise} =
Cu.import("resource://gre/modules/devtools/deprecated-sync-thenables.js", {});
Cu.import("resource://gre/modules/devtools/shared/deprecated-sync-thenables.js", {});
const {require} =
Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {AppProjects} = require("devtools/app-manager/app-projects");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const {AppProjects} = require("devtools/client/app-manager/app-projects");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const APP_MANAGER_URL = "about:app-manager";
const TEST_BASE =

4
devtools/client/app-manager/test/test_app_validator.html
Просмотреть файл

@ -18,9 +18,9 @@
const Cc = Components.classes;
const Ci = Components.interfaces;
Cu.import("resource://testing-common/httpd.js");
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const {AppValidator} = require("devtools/app-manager/app-validator");
const {AppValidator} = require("devtools/client/app-manager/app-validator");
const {Services} = Cu.import("resource://gre/modules/Services.jsm");
const nsFile = Components.Constructor("@mozilla.org/file/local;1",
"nsILocalFile", "initWithPath");

8
devtools/client/app-manager/test/test_connection_store.html
Просмотреть файл

@ -25,7 +25,7 @@ Bug 901519 - [app manager] data store for connections
<script type="application/javascript;version=1.8" src="chrome://devtools/content/app-manager/content/template.js"></script>
<script type="application/javascript;version=1.8">
const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm");
const {DebuggerServer} = require("devtools/server/main");
if (!DebuggerServer.initialized) {
@ -37,10 +37,10 @@ Bug 901519 - [app manager] data store for connections
SimpleTest.waitForExplicitFinish();
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/devtools/gDevTools.jsm");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {ConnectionManager} = require("devtools/client/connection-manager");
const ConnectionStore = require("devtools/app-manager/connection-store");
const {ConnectionManager} = require("devtools/shared/client/connection-manager");
const ConnectionStore = require("devtools/client/app-manager/connection-store");
let connection = ConnectionManager.createConnection();
let store = new ConnectionStore(connection);

8
devtools/client/app-manager/test/test_device_store.html
Просмотреть файл

@ -19,7 +19,7 @@ Bug 901520 - [app manager] data store for device
<script type="application/javascript;version=1.8" src="chrome://devtools/content/app-manager/content/template.js"></script>
<script type="application/javascript;version=1.8">
const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm");
const {DebuggerServer} = require("devtools/server/main");
if (!DebuggerServer.initialized) {
@ -35,10 +35,10 @@ Bug 901520 - [app manager] data store for device
SimpleTest.waitForExplicitFinish();
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/devtools/gDevTools.jsm");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {ConnectionManager} = require("devtools/client/connection-manager");
const DeviceStore = require("devtools/app-manager/device-store");
const {ConnectionManager} = require("devtools/shared/client/connection-manager");
const DeviceStore = require("devtools/client/app-manager/device-store");
let {getDeviceFront} = require("devtools/server/actors/device");

4
devtools/client/app-manager/test/test_projects_store.html
Просмотреть файл

@ -22,9 +22,9 @@ Bug 907206 - data store for local apps
window.onload = function() {
SimpleTest.waitForExplicitFinish();
const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const { AppProjects } = require("devtools/app-manager/app-projects");
const { AppProjects } = require("devtools/client/app-manager/app-projects");
function testHosted(projects) {
let manifestURL = document.location.href.replace("test_projects_store.html", "hosted_app/webapp.manifest");

12
devtools/client/app-manager/test/test_remain_connected.html
Просмотреть файл

@ -18,7 +18,7 @@ Bug 912646 - Closing app toolbox causes phone to disconnect
<script type="application/javascript;version=1.8">
const Cu = Components.utils;
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm");
const {DebuggerServer} = require("devtools/server/main");
if (!DebuggerServer.initialized) {
@ -29,15 +29,15 @@ Bug 912646 - Closing app toolbox causes phone to disconnect
window.onload = function() {
SimpleTest.waitForExplicitFinish();
Cu.import("resource:///modules/devtools/gDevTools.jsm");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {TargetFactory} = require("devtools/framework/target");
const {Toolbox} = require("devtools/framework/toolbox");
const {TargetFactory} = require("devtools/client/framework/target");
const {Toolbox} = require("devtools/client/framework/toolbox");
const {Connection, ConnectionManager} =
require("devtools/client/connection-manager");
require("devtools/shared/client/connection-manager");
const ConnectionStore =
require("devtools/app-manager/connection-store");
require("devtools/client/app-manager/connection-store");
let connection = ConnectionManager.createConnection();

6
devtools/client/app-manager/test/test_template.html
Просмотреть файл

@ -158,9 +158,9 @@
SimpleTest.waitForExplicitFinish();
const Cu = Components.utils;
Cu.import("resource:///modules/devtools/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const ObservableObject = require("devtools/shared/observable-object");
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
const {require} = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const ObservableObject = require("devtools/client/shared/observable-object");
let data = {
title: "ttt",

6
devtools/client/app-manager/webapps-store.js
Просмотреть файл

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const ObservableObject = require("devtools/shared/observable-object");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
const {Connection} = require("devtools/client/connection-manager");
const ObservableObject = require("devtools/client/shared/observable-object");
const promise = require("devtools/shared/deprecated-sync-thenables");
const {Connection} = require("devtools/shared/client/connection-manager");
const {Cu} = require("chrome");
const _knownWebappsStores = new WeakMap();

16
devtools/client/canvasdebugger/canvasdebugger.js
Просмотреть файл

@ -7,18 +7,18 @@ const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource:///modules/devtools/SideMenuWidget.jsm");
Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
Cu.import("resource://gre/modules/devtools/Console.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/SideMenuWidget.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
Cu.import("resource://gre/modules/devtools/shared/Console.jsm");
const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
const { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
const promise = require("promise");
const EventEmitter = require("devtools/toolkit/event-emitter");
const EventEmitter = require("devtools/shared/event-emitter");
const { CallWatcherFront } = require("devtools/server/actors/call-watcher");
const { CanvasFront } = require("devtools/server/actors/canvas");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const Telemetry = require("devtools/shared/telemetry");
const Telemetry = require("devtools/client/shared/telemetry");
const telemetry = new Telemetry();
const CANVAS_ACTOR_RECORDING_ATTEMPT = DevToolsUtils.testing ? 500 : 5000;
@ -36,7 +36,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
"resource://gre/modules/NetUtil.jsm");
XPCOMUtils.defineLazyGetter(this, "NetworkHelper", function() {
return require("devtools/toolkit/webconsole/network-helper");
return require("devtools/shared/webconsole/network-helper");
});
// The panel's window global is an EventEmitter firing the following events:

4
devtools/client/canvasdebugger/moz.build
Просмотреть файл

@ -3,8 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES.devtools.canvasdebugger += [
DevToolsModules(
'panel.js'
]
)
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

4
devtools/client/canvasdebugger/panel.js
Просмотреть файл

@ -7,9 +7,9 @@
const { Cc, Ci, Cu, Cr } = require("chrome");
const promise = require("promise");
const EventEmitter = require("devtools/toolkit/event-emitter");
const EventEmitter = require("devtools/shared/event-emitter");
const { CanvasFront } = require("devtools/server/actors/canvas");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
function CanvasDebuggerPanel(iframeWindow, toolbox) {
this.panelWin = iframeWindow;

14
devtools/client/canvasdebugger/test/head.js
Просмотреть файл

@ -13,19 +13,19 @@ Services.prefs.setBoolPref("devtools.debugger.log", false);
var { generateUUID } = Cc['@mozilla.org/uuid-generator;1'].getService(Ci.nsIUUIDGenerator);
var { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
var { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
var { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
var { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
var promise = require("promise");
var { DebuggerClient } = require("devtools/toolkit/client/main");
var { DebuggerClient } = require("devtools/shared/client/main");
var { DebuggerServer } = require("devtools/server/main");
var { CallWatcherFront } = require("devtools/server/actors/call-watcher");
var { CanvasFront } = require("devtools/server/actors/canvas");
var { setTimeout } = require("sdk/timers");
var DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
var TiltGL = require("devtools/tilt/tilt-gl");
var { TargetFactory } = require("devtools/framework/target");
var { Toolbox } = require("devtools/framework/toolbox");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var TiltGL = require("devtools/client/tilt/tilt-gl");
var { TargetFactory } = require("devtools/client/framework/target");
var { Toolbox } = require("devtools/client/framework/toolbox");
var mm = null
const FRAME_SCRIPT_UTILS_URL = "chrome://devtools/content/shared/frame-script-utils.js";

2
devtools/client/commandline/test/browser_cmd_highlight_02.js
Просмотреть файл

@ -36,7 +36,7 @@ function test() {
function getHighlighterNumber() {
// Note that this only works as long as gcli tests aren't run with e10s on.
// To make this e10s ready, execute this in a content frame script instead.
return require("devtools/toolkit/gcli/commands/highlight").highlighters.length;
return require("devtools/shared/gcli/commands/highlight").highlighters.length;
}
function* runCommand(cmd, options) {

2
devtools/client/commandline/test/browser_cmd_settings.js
Просмотреть файл

@ -23,7 +23,7 @@ function* spawnTest() {
const { createSystem } = require("gcli/system");
const system = createSystem({ location: "server" });
const gcliInit = require("devtools/toolkit/gcli/commands/index");
const gcliInit = require("devtools/shared/gcli/commands/index");
gcliInit.addAllItemsByModule(system);
yield system.load();

6
devtools/client/commandline/test/head.js
Просмотреть файл

@ -5,9 +5,9 @@
const TEST_BASE_HTTP = "http://example.com/browser/browser/devtools/commandline/test/";
const TEST_BASE_HTTPS = "https://example.com/browser/browser/devtools/commandline/test/";
var { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
var { console } = require("resource://gre/modules/devtools/Console.jsm");
var DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
var { console } = require("resource://gre/modules/devtools/shared/Console.jsm");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
// Import the GCLI test helper
var testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));

4
devtools/client/commandline/test/helpers.js
Просмотреть файл

@ -22,8 +22,8 @@ var { helpers, assert } = (function() {
var helpers = {};
var { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
var { TargetFactory } = require("devtools/framework/target");
var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
var { TargetFactory } = require("devtools/client/framework/target");
var assert = { ok: ok, is: is, log: info };
var util = require('gcli/util/util');

2
devtools/client/debugger/content/actions/event-listeners.js
Просмотреть файл

@ -5,7 +5,7 @@
const constants = require("../constants");
const { rdpInvoke, asPaused } = require("../utils");
const { reportException } = require("devtools/toolkit/DevToolsUtils");
const { reportException } = require("devtools/shared/DevToolsUtils");
const FETCH_EVENT_LISTENERS_DELAY = 200; // ms

8
devtools/client/debugger/content/actions/moz.build Normal file
Просмотреть файл

@ -0,0 +1,8 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DevToolsModules(
'event-listeners.js',
)

16
devtools/client/debugger/content/moz.build Normal file
Просмотреть файл

@ -0,0 +1,16 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
'actions',
'reducers',
'views',
]
DevToolsModules(
'constants.js',
'globalActions.js',
'utils.js'
)

9
devtools/client/debugger/content/reducers/moz.build Normal file
Просмотреть файл

@ -0,0 +1,9 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DevToolsModules(
'event-listeners.js',
'index.js'
)

4
devtools/client/debugger/content/utils.js
Просмотреть файл

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { promiseInvoke } = require("devtools/async-utils");
const { reportException } = require("devtools/toolkit/DevToolsUtils");
const { promiseInvoke } = require("devtools/shared/async-utils");
const { reportException } = require("devtools/shared/DevToolsUtils");
function rdpInvoke(client, method, ...args) {
return promiseInvoke(client, method, ...args)

2
devtools/client/debugger/content/views/event-listeners-view.js
Просмотреть файл

@ -4,7 +4,7 @@
"use strict";
const actions = require('../actions/event-listeners');
const { bindActionCreators } = require('devtools/shared/vendor/redux');
const { bindActionCreators } = require('devtools/client/shared/vendor/redux');
/**
* Functions handling the event listeners UI.

8
devtools/client/debugger/content/views/moz.build Normal file
Просмотреть файл

@ -0,0 +1,8 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DevToolsModules(
'event-listeners-view.js'
)

2
devtools/client/debugger/debugger-commands.js
Просмотреть файл

@ -7,7 +7,7 @@
const { Cc, Ci, Cu } = require("chrome");
const l10n = require("gcli/l10n");
loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/client/framework/gDevTools.jsm");
/**
* The commands and converters that are exported to GCLI

38
devtools/client/debugger/debugger-controller.js
Просмотреть файл

@ -94,31 +94,31 @@ const FRAME_TYPE = {
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/devtools/event-emitter.js");
Cu.import("resource:///modules/devtools/SimpleListWidget.jsm");
Cu.import("resource:///modules/devtools/BreadcrumbsWidget.jsm");
Cu.import("resource:///modules/devtools/SideMenuWidget.jsm");
Cu.import("resource:///modules/devtools/VariablesView.jsm");
Cu.import("resource:///modules/devtools/VariablesViewController.jsm");
Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
Cu.import("resource://gre/modules/devtools/shared/event-emitter.js");
Cu.import("resource:///modules/devtools/client/shared/widgets/SimpleListWidget.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/BreadcrumbsWidget.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/SideMenuWidget.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/VariablesView.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/VariablesViewController.jsm");
Cu.import("resource:///modules/devtools/client/shared/widgets/ViewHelpers.jsm");
Cu.import("resource:///modules/devtools/shared/browser-loader.js");
const require = BrowserLoader("resource:///modules/devtools/debugger/", this).require;
Cu.import("resource:///modules/devtools/client/shared/browser-loader.js");
const require = BrowserLoader("resource:///modules/devtools/client/debugger/", this).require;
const {TargetFactory} = require("devtools/framework/target");
const {Toolbox} = require("devtools/framework/toolbox");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const promise = require("devtools/toolkit/deprecated-sync-thenables");
const Editor = require("devtools/sourceeditor/editor");
const DebuggerEditor = require("devtools/sourceeditor/debugger.js");
const {Tooltip} = require("devtools/shared/widgets/Tooltip");
const FastListWidget = require("devtools/shared/widgets/FastListWidget");
const {TargetFactory} = require("devtools/client/framework/target");
const {Toolbox} = require("devtools/client/framework/toolbox");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const promise = require("devtools/shared/deprecated-sync-thenables");
const Editor = require("devtools/client/sourceeditor/editor");
const DebuggerEditor = require("devtools/client/sourceeditor/debugger");
const {Tooltip} = require("devtools/client/shared/widgets/Tooltip");
const FastListWidget = require("devtools/client/shared/widgets/FastListWidget");
XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Parser",
"resource:///modules/devtools/Parser.jsm");
"resource:///modules/devtools/client/shared/Parser.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
"resource://gre/modules/ShortcutUtils.jsm");
@ -128,7 +128,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
Object.defineProperty(this, "NetworkHelper", {
get: function() {
return require("devtools/toolkit/webconsole/network-helper");
return require("devtools/shared/webconsole/network-helper");
},
configurable: true,
enumerable: true

6
devtools/client/debugger/debugger-view.js
Просмотреть файл

@ -36,11 +36,11 @@ const PROMISE_DEBUGGER_URL =
"chrome://devtools/content/promisedebugger/promise-debugger.xhtml";
const debuggerControllerEmit = DebuggerController.emit.bind(DebuggerController);
const createStore = require("devtools/shared/redux/create-store")();
const { combineEmittingReducers } = require("devtools/shared/redux/reducers");
const createStore = require("devtools/client/shared/redux/create-store")();
const { combineEmittingReducers } = require("devtools/client/shared/redux/reducers");
const reducers = require("./content/reducers/index");
const store = createStore(combineEmittingReducers(reducers, debuggerControllerEmit));
const { NAME: WAIT_UNTIL_NAME } = require("devtools/shared/redux/middleware/wait-service");
const { NAME: WAIT_UNTIL_NAME } = require("devtools/client/shared/redux/middleware/wait-service");
const services = {
WAIT_UNTIL: WAIT_UNTIL_NAME

27
devtools/client/debugger/moz.build
Просмотреть файл

@ -3,28 +3,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES.devtools.debugger += [
DIRS += [
'content',
]
DevToolsModules(
'debugger-commands.js',
'panel.js'
]
EXTRA_JS_MODULES.devtools.debugger.content += [
'content/constants.js',
'content/globalActions.js',
'content/utils.js'
]
EXTRA_JS_MODULES.devtools.debugger.content.views += [
'content/views/event-listeners-view.js'
]
EXTRA_JS_MODULES.devtools.debugger.content.reducers += [
'content/reducers/event-listeners.js',
'content/reducers/index.js'
]
EXTRA_JS_MODULES.devtools.debugger.content.actions += [
'content/actions/event-listeners.js',
]
)
BROWSER_CHROME_MANIFESTS += ['test/mochitest/browser.ini']

4
devtools/client/debugger/panel.js
Просмотреть файл

@ -7,8 +7,8 @@
const { Cc, Ci, Cu, Cr } = require("chrome");
const promise = require("promise");
const EventEmitter = require("devtools/toolkit/event-emitter");
const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
const EventEmitter = require("devtools/shared/event-emitter");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
function DebuggerPanel(iframeWindow, toolbox) {
this.panelWin = iframeWindow;

2
devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js
Просмотреть файл

@ -12,7 +12,7 @@ var gAttached = promise.defer();
var gNewGlobal = promise.defer()
var gNewChromeSource = promise.defer()
var { DevToolsLoader } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
var { DevToolsLoader } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
var loader = new DevToolsLoader();
loader.invisibleToDebugger = true;
loader.main("devtools/server/main");

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-01.js
Просмотреть файл

@ -6,7 +6,7 @@
*/
function test() {
let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let source = "let x = 42;";
let parser = new Parser();

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-02.js
Просмотреть файл

@ -6,7 +6,7 @@
*/
function test() {
let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let source = "let x + 42;";
let parser = new Parser();

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-03.js
Просмотреть файл

@ -6,7 +6,7 @@
*/
function test() {
let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let source = [
"<!doctype html>",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-04.js
Просмотреть файл

@ -6,7 +6,7 @@
*/
function test() {
let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let source = [
"<!doctype html>",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-05.js
Просмотреть файл

@ -7,7 +7,7 @@
*/
function test() {
let { Parser } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { Parser } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let source = [
"let a = [];",

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-06.js
Просмотреть файл

@ -8,7 +8,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource:///modules/devtools/Parser.jsm", {});
Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
function verify(source, predicate, [sline, scol], [eline, ecol]) {
let ast = Parser.reflectionAPI.parse(source);

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-07.js
Просмотреть файл

@ -7,7 +7,7 @@
*/
function test() {
let { ParserHelpers } = Cu.import("resource:///modules/devtools/Parser.jsm", {});
let { ParserHelpers } = Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
let node1 = { loc: {
start: { line: 1, column: 10 },

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-08.js
Просмотреть файл

@ -7,7 +7,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource:///modules/devtools/Parser.jsm", {});
Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
function verify(source, predicate, details) {
let { name, chain } = details;

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-09.js
Просмотреть файл

@ -8,7 +8,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource:///modules/devtools/Parser.jsm", {});
Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
function verify(source, predicate, details) {
let { name, chain } = details;

2
devtools/client/debugger/test/mochitest/browser_dbg_parser-10.js
Просмотреть файл

@ -7,7 +7,7 @@
function test() {
let { Parser, ParserHelpers, SyntaxTreeVisitor } =
Cu.import("resource:///modules/devtools/Parser.jsm", {});
Cu.import("resource:///modules/devtools/client/shared/Parser.jsm", {});
function verify(source, predicate, string) {
let ast = Parser.reflectionAPI.parse(source);

2
devtools/client/debugger/test/mochitest/code_ugly-4.js
Просмотреть файл

@ -4,7 +4,7 @@ function a(){b()}function b(){debugger}
// Generate this file by evaluating the following in a browser-environment
// scratchpad:
//
// let { require } = Components.utils.import('resource://gre/modules/devtools/Loader.jsm', {});
// let { require } = Components.utils.import('resource://gre/modules/devtools/shared/Loader.jsm', {});
// let { SourceNode } = require("source-map");
//
// let dataUrl = s => "data:text/javascript," + s;

20
devtools/client/debugger/test/mochitest/head.js
Просмотреть файл

@ -13,18 +13,18 @@ var gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
Services.prefs.setBoolPref("devtools.debugger.log", false);
var { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
var { Promise: promise } = Cu.import("resource://gre/modules/devtools/deprecated-sync-thenables.js", {});
var { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
var { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
var DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
var { BrowserToolboxProcess } = Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", {});
var { Promise: promise } = Cu.import("resource://gre/modules/devtools/shared/deprecated-sync-thenables.js", {});
var { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var { BrowserToolboxProcess } = Cu.import("resource:///modules/devtools/client/framework/ToolboxProcess.jsm", {});
var { DebuggerServer } = require("devtools/server/main");
var { DebuggerClient, ObjectClient } = require("devtools/toolkit/client/main");
var { DebuggerClient, ObjectClient } = require("devtools/shared/client/main");
var { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
var EventEmitter = require("devtools/toolkit/event-emitter");
const { promiseInvoke } = require("devtools/async-utils");
var { TargetFactory } = require("devtools/framework/target");
var { Toolbox } = require("devtools/framework/toolbox")
var EventEmitter = require("devtools/shared/event-emitter");
const { promiseInvoke } = require("devtools/shared/async-utils");
var { TargetFactory } = require("devtools/client/framework/target");
var { Toolbox } = require("devtools/client/framework/toolbox")
const EXAMPLE_URL = "http://example.com/browser/browser/devtools/debugger/test/mochitest/";
const FRAME_SCRIPT_URL = getRootDirectory(gTestPath) + "code_frame-script.js";

40
devtools/client/definitions.js
Просмотреть файл

@ -11,19 +11,19 @@ const { Services } = require("resource://gre/modules/Services.jsm");
loader.lazyGetter(this, "osString", () => Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS);
// Panels
loader.lazyGetter(this, "OptionsPanel", () => require("devtools/framework/toolbox-options").OptionsPanel);
loader.lazyGetter(this, "InspectorPanel", () => require("devtools/inspector/inspector-panel").InspectorPanel);
loader.lazyGetter(this, "WebConsolePanel", () => require("devtools/webconsole/panel").WebConsolePanel);
loader.lazyGetter(this, "DebuggerPanel", () => require("devtools/debugger/panel").DebuggerPanel);
loader.lazyGetter(this, "StyleEditorPanel", () => require("devtools/styleeditor/styleeditor-panel").StyleEditorPanel);
loader.lazyGetter(this, "ShaderEditorPanel", () => require("devtools/shadereditor/panel").ShaderEditorPanel);
loader.lazyGetter(this, "CanvasDebuggerPanel", () => require("devtools/canvasdebugger/panel").CanvasDebuggerPanel);
loader.lazyGetter(this, "WebAudioEditorPanel", () => require("devtools/webaudioeditor/panel").WebAudioEditorPanel);
loader.lazyGetter(this, "MemoryPanel", () => require("devtools/memory/panel").MemoryPanel);
loader.lazyGetter(this, "PerformancePanel", () => require("devtools/performance/panel").PerformancePanel);
loader.lazyGetter(this, "NetMonitorPanel", () => require("devtools/netmonitor/panel").NetMonitorPanel);
loader.lazyGetter(this, "StoragePanel", () => require("devtools/storage/panel").StoragePanel);
loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/scratchpad/scratchpad-panel").ScratchpadPanel);
loader.lazyGetter(this, "OptionsPanel", () => require("devtools/client/framework/toolbox-options").OptionsPanel);
loader.lazyGetter(this, "InspectorPanel", () => require("devtools/client/inspector/inspector-panel").InspectorPanel);
loader.lazyGetter(this, "WebConsolePanel", () => require("devtools/client/webconsole/panel").WebConsolePanel);
loader.lazyGetter(this, "DebuggerPanel", () => require("devtools/client/debugger/panel").DebuggerPanel);
loader.lazyGetter(this, "StyleEditorPanel", () => require("devtools/client/styleeditor/styleeditor-panel").StyleEditorPanel);
loader.lazyGetter(this, "ShaderEditorPanel", () => require("devtools/client/shadereditor/panel").ShaderEditorPanel);
loader.lazyGetter(this, "CanvasDebuggerPanel", () => require("devtools/client/canvasdebugger/panel").CanvasDebuggerPanel);
loader.lazyGetter(this, "WebAudioEditorPanel", () => require("devtools/client/webaudioeditor/panel").WebAudioEditorPanel);
loader.lazyGetter(this, "MemoryPanel", () => require("devtools/client/memory/panel").MemoryPanel);
loader.lazyGetter(this, "PerformancePanel", () => require("devtools/client/performance/panel").PerformancePanel);
loader.lazyGetter(this, "NetMonitorPanel", () => require("devtools/client/netmonitor/panel").NetMonitorPanel);
loader.lazyGetter(this, "StoragePanel", () => require("devtools/client/storage/panel").StoragePanel);
loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/client/scratchpad/scratchpad-panel").ScratchpadPanel);
// Strings
const toolboxProps = "chrome://browser/locale/devtools/toolbox.properties";
@ -95,9 +95,9 @@ Tools.inspector = {
},
inMenu: true,
commands: [
"devtools/responsivedesign/resize-commands",
"devtools/inspector/inspector-commands",
"devtools/eyedropper/commands.js"
"devtools/client/responsivedesign/resize-commands",
"devtools/client/inspector/inspector-commands",
"devtools/client/eyedropper/commands.js"
],
preventClosingOnKey: true,
@ -131,7 +131,7 @@ Tools.webConsole = {
( osString == "Darwin" ? "Cmd+Opt+" : "Ctrl+Shift+" ) + this.key);
},
inMenu: true,
commands: "devtools/webconsole/console-commands",
commands: "devtools/client/webconsole/console-commands",
preventClosingOnKey: true,
onkey: function(panel, toolbox) {
@ -167,7 +167,7 @@ Tools.jsdebugger = {
( osString == "Darwin" ? "Cmd+Opt+" : "Ctrl+Shift+" ) + this.key);
},
inMenu: true,
commands: "devtools/debugger/debugger-commands",
commands: "devtools/client/debugger/debugger-commands",
isTargetSupported: function(target) {
return true;
@ -194,7 +194,7 @@ Tools.styleEditor = {
"Shift+" + functionkey(this.key));
},
inMenu: true,
commands: "devtools/styleeditor/styleeditor-commands",
commands: "devtools/client/styleeditor/styleeditor-commands",
isTargetSupported: function(target) {
return target.hasActor("styleEditor") || target.hasActor("styleSheets");
@ -388,7 +388,7 @@ Tools.scratchpad = {
panelLabel: l10n("scratchpad.panelLabel", scratchpadStrings),
tooltip: l10n("scratchpad.tooltip", scratchpadStrings),
inMenu: false,
commands: "devtools/scratchpad/scratchpad-commands",
commands: "devtools/client/scratchpad/scratchpad-commands",
isTargetSupported: function(target) {
return target.isRemote;

12
devtools/client/devtools-clhandler.js
Просмотреть файл

@ -39,11 +39,11 @@ devtoolsCommandlineHandler.prototype = {
handleConsoleFlag: function(cmdLine) {
let window = Services.wm.getMostRecentWindow("devtools:webconsole");
if (!window) {
let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
let { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
// Load the browser devtools main module as the loader's main module.
Cu.import("resource:///modules/devtools/gDevTools.jsm");
let hudservice = require("devtools/webconsole/hudservice");
let { console } = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm");
let hudservice = require("devtools/client/webconsole/hudservice");
let { console } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm", {});
hudservice.toggleBrowserConsole().then(null, console.error);
} else {
window.focus(); // the Browser Console was already open
@ -77,7 +77,7 @@ devtoolsCommandlineHandler.prototype = {
if (!this._isRemoteDebuggingEnabled()) {
return;
}
Cu.import("resource:///modules/devtools/ToolboxProcess.jsm");
Cu.import("resource:///modules/devtools/client/framework/ToolboxProcess.jsm");
BrowserToolboxProcess.init();
if (cmdLine.state == Ci.nsICommandLine.STATE_REMOTE_AUTO) {
@ -94,7 +94,7 @@ devtoolsCommandlineHandler.prototype = {
portOrPath = 6000;
}
let { DevToolsLoader } =
Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
try {
// Create a separate loader instance, so that we can be sure to receive

4
devtools/client/eyedropper/commands.js
Просмотреть файл

@ -3,10 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const l10n = require("gcli/l10n");
const EventEmitter = require("devtools/toolkit/event-emitter");
const EventEmitter = require("devtools/shared/event-emitter");
const eventEmitter = new EventEmitter();
var { Eyedropper, EyedropperManager } = require("devtools/eyedropper/eyedropper");
var { Eyedropper, EyedropperManager } = require("devtools/client/eyedropper/eyedropper");
/**
* 'eyedropper' command

8
devtools/client/eyedropper/eyedropper.js
Просмотреть файл

@ -3,9 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const {Cc, Ci, Cu} = require("chrome");
const {rgbToHsl} = require("devtools/css-color").colorUtils;
const Telemetry = require("devtools/shared/telemetry");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js");
const {rgbToHsl} = require("devtools/shared/css-color").colorUtils;
const Telemetry = require("devtools/client/shared/telemetry");
const {EventEmitter} = Cu.import("resource://gre/modules/devtools/shared/event-emitter.js");
const promise = require("promise");
const {setTimeout, clearTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
@ -133,7 +133,7 @@ function Eyedropper(chromeWindow, opts = { copyOnSelect: true, context: "other"
};
let mm = this._contentTab.linkedBrowser.messageManager;
mm.loadFrameScript("resource:///modules/devtools/eyedropper/eyedropper-child.js", true);
mm.loadFrameScript("resource:///modules/devtools/client/eyedropper/eyedropper-child.js", true);
// record if this was opened via the picker or standalone
var telemetry = new Telemetry();

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше