Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge fx-team to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-09-22 12:18:16 +02:00
commit 396d307d5e
3992 changed files with 6261 additions and 5797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -57,8 +57,8 @@ python/psutil/**/*.pyd
python/psutil/build/ python/psutil/build/
# Ignore chrome.manifest files from the devtools loader # Ignore chrome.manifest files from the devtools loader
browser/devtools/chrome.manifest devtools/client/chrome.manifest
toolkit/devtools/chrome.manifest devtools/shared/chrome.manifest
# Tag files generated by GNU Global # Tag files generated by GNU Global
GTAGS GTAGS

4
.hgignore
View File

@ -64,8 +64,8 @@ _OPT\.OBJ/
.git/ .git/
# Ignore chrome.manifest files from the devtools loader # Ignore chrome.manifest files from the devtools loader
^browser/devtools/chrome.manifest$ ^devtools/client/chrome.manifest$
^toolkit/devtools/chrome.manifest$ ^devtools/shared/chrome.manifest$
# git checkout of libstagefright # git checkout of libstagefright
^media/libstagefright/android$ ^media/libstagefright/android$

2
addon-sdk/source/lib/dev/debuggee.js
View File

@ -11,7 +11,7 @@ module.metadata = {
const { Cu } = require("chrome"); const { Cu } = require("chrome");
const { Class } = require("../sdk/core/heritage"); const { Class } = require("../sdk/core/heritage");
const { MessagePort, MessageChannel } = require("../sdk/messaging"); 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 { DebuggerServer } = devtoolsRequire("devtools/server/main");
const outputs = new WeakMap(); const outputs = new WeakMap();

2
addon-sdk/source/lib/dev/toolbox.js
View File

@ -15,7 +15,7 @@ const { contract, validate } = require("../sdk/util/contract");
const { each, pairs, values } = require("../sdk/util/sequence"); const { each, pairs, values } = require("../sdk/util/sequence");
const { onEnable, onDisable } = require("../dev/theme/hooks"); 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 // 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 // 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
View File

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

2
addon-sdk/source/lib/sdk/addon/runner.js
View File

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

2
addon-sdk/source/lib/sdk/console/plain-text.js
View File

@ -12,7 +12,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
const self = require("../self"); const self = require("../self");
const prefs = require("../preferences/service"); const prefs = require("../preferences/service");
const { merge } = require("../util/object"); 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 DEFAULT_LOG_LEVEL = "error";
const ADDON_LOG_LEVEL_PREF = "extensions." + self.id + ".sdk.console.logLevel"; const ADDON_LOG_LEVEL_PREF = "extensions." + self.id + ".sdk.console.logLevel";

2
addon-sdk/source/lib/sdk/loader/sandbox.js
View File

@ -15,7 +15,7 @@ const self = require('sdk/self');
const { getTabId, getTabForContentWindow } = require('../tabs/utils'); const { getTabId, getTabForContentWindow } = require('../tabs/utils');
const { getInnerId } = require('../window/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 { require: devtoolsRequire } = devtools;
const { addContentGlobal, removeContentGlobal } = devtoolsRequire("devtools/server/content-globals"); const { addContentGlobal, removeContentGlobal } = devtoolsRequire("devtools/server/content-globals");

2
addon-sdk/source/lib/toolkit/loader.js
View File

@ -798,7 +798,7 @@ function Loader(options) {
globals: { globals: {
get console() { get console() {
// Import Console.jsm from here to prevent loading it until someone uses it // 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({ let console = new ConsoleAPI({
consoleID: options.id ? "addon/" + options.id : "" consoleID: options.id ? "addon/" + options.id : ""
}); });

4
addon-sdk/source/test/addons/page-mod-debugger-post/main.js
View File

@ -12,9 +12,9 @@ const { getMostRecentBrowserWindow } = require('sdk/window/utils');
const { data } = require('sdk/self'); const { data } = require('sdk/self');
const { set } = require('sdk/preferences/service'); 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 { DebuggerServer } = devtoolsRequire("devtools/server/main");
const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main"); const { DebuggerClient } = devtoolsRequire("devtools/shared/client/main");
var gClient; var gClient;
var ok; var ok;

4
addon-sdk/source/test/addons/page-mod-debugger-pre/main.js
View File

@ -12,9 +12,9 @@ const { getMostRecentBrowserWindow } = require('sdk/window/utils');
const { data } = require('sdk/self'); const { data } = require('sdk/self');
const { set } = require('sdk/preferences/service'); 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 { DebuggerServer } = devtoolsRequire("devtools/server/main");
const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main"); const { DebuggerClient } = devtoolsRequire("devtools/shared/client/main");
var gClient; var gClient;
var ok; var ok;

2
addon-sdk/source/test/test-page-mod-debug.js
View File

@ -10,7 +10,7 @@ const { testPageMod, handleReadyState, openNewTab,
const { cleanUI, after } = require("sdk/test/utils"); const { cleanUI, after } = require("sdk/test/utils");
const { open, getFrames, getMostRecentBrowserWindow, getInnerId } = require("sdk/window/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 { require: devtoolsRequire } = devtools;
const contentGlobals = devtoolsRequire("devtools/server/content-globals"); const contentGlobals = devtoolsRequire("devtools/server/content-globals");

2
addon-sdk/test/head.js
View File

@ -5,7 +5,7 @@
const { utils: Cu } = Components; const { utils: Cu } = Components;
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const LoaderModule = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {}).Loader; 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 { var {
Loader, main, Module, Require, unload Loader, main, Module, Require, unload
} = LoaderModule; } = LoaderModule;

10
b2g/chrome/content/desktop.js
View File

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

8
b2g/chrome/content/devtools/debugger.js
View File

@ -8,7 +8,7 @@
XPCOMUtils.defineLazyGetter(this, "devtools", function() { XPCOMUtils.defineLazyGetter(this, "devtools", function() {
const { devtools } = const { devtools } =
Cu.import("resource://gre/modules/devtools/Loader.jsm", {}); Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
return devtools; 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 // 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 // startup. This does not cause discovery to start listening for packets, as
// that only happens once DevTools is enabled. // that only happens once DevTools is enabled.
devtools.require("devtools/toolkit/discovery/discovery"); devtools.require("devtools/shared/discovery/discovery");
var RemoteDebugger = { var RemoteDebugger = {
_listening: false, _listening: false,
@ -49,7 +49,7 @@ var RemoteDebugger = {
* } * }
* Specific authentication modes may include additional fields. Check * Specific authentication modes may include additional fields. Check
* the different |allowConnection| methods in * the different |allowConnection| methods in
* toolkit/devtools/security/auth.js. * devtools/shared/security/auth.js.
* @return An AuthenticationResult value. * @return An AuthenticationResult value.
* A promise that will be resolved to the above is also allowed. * A promise that will be resolved to the above is also allowed.
*/ */
@ -103,7 +103,7 @@ var RemoteDebugger = {
} }
this._listen(); 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._receivingOOB = new Promise((resolve, reject) => {
this._handleAuthEvent = detail => { this._handleAuthEvent = detail => {
debug(detail.action); debug(detail.action);

6
b2g/chrome/content/devtools/hud.js
View File

@ -10,16 +10,16 @@ const DEVELOPER_HUD_LOG_PREFIX = 'DeveloperHUD';
const CUSTOM_HISTOGRAM_PREFIX = 'DEVTOOLS_HUD_CUSTOM_'; const CUSTOM_HISTOGRAM_PREFIX = 'DEVTOOLS_HUD_CUSTOM_';
XPCOMUtils.defineLazyGetter(this, 'devtools', function() { 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; return devtools;
}); });
XPCOMUtils.defineLazyGetter(this, 'DebuggerClient', function() { 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() { 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() { XPCOMUtils.defineLazyGetter(this, 'EventLoopLagFront', function() {

2
b2g/components/DebuggerActors.js
View File

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

2
b2g/simulator/bootstrap.js vendored
View File

@ -31,7 +31,7 @@ function startup(data, reason) {
Cu.import('resource://gre/modules/commonjs/toolkit/loader.js').Loader; Cu.import('resource://gre/modules/commonjs/toolkit/loader.js').Loader;
let { Loader, Require, Main } = loaderModule; 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({ let loader = Loader({
paths: { paths: {

2
b2g/simulator/lib/main.js
View File

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

2
b2g/simulator/lib/simulator-process.js
View File

@ -13,7 +13,7 @@ const Environment = require("sdk/system/environment").env;
const Runtime = require("sdk/system/runtime"); const Runtime = require("sdk/system/runtime");
const Subprocess = require("sdk/system/child_process/subprocess"); const Subprocess = require("sdk/system/child_process/subprocess");
const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); 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 // Log subprocess error and debug messages to the console. This logs messages

1
browser/app.mozbuild
View File

@ -17,4 +17,3 @@ if CONFIG['MOZ_WEBAPP_RUNTIME']:
# Never add dirs after browser because they apparently won't get # Never add dirs after browser because they apparently won't get
# packaged properly on Mac. # packaged properly on Mac.
DIRS += ['/browser'] DIRS += ['/browser']

20
browser/base/content/browser.js
View File

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

2
browser/base/content/browser.xul
View File

@ -8,7 +8,7 @@
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> <?xml-stylesheet href="chrome://devtools/skin/themes/common.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>

2
browser/base/content/nsContextMenu.js
View File

@ -555,7 +555,7 @@ nsContextMenu.prototype = {
}, },
inspectNode: function CM_inspectNode() { 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 gBrowser = this.browser.ownerDocument.defaultView.gBrowser;
let tt = devtools.TargetFactory.forTab(gBrowser.selectedTab); let tt = devtools.TargetFactory.forTab(gBrowser.selectedTab);
return gDevTools.showToolbox(tt, "inspector").then(function(toolbox) { return gDevTools.showToolbox(tt, "inspector").then(function(toolbox) {

2
browser/base/content/test/general/test_no_mcb_on_http_site_font.css
View File

@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: testFont; font-family: testFont;
src: url(http://example.com/browser/browser/devtools/fontinspector/test/browser_font.woff); src: url(http://example.com/browser/devtools/client/fontinspector/test/browser_font.woff);
} }
body { body {
font-family: Arial; font-family: Arial;

2
browser/components/about/AboutRedirector.cpp
View File

@ -99,7 +99,7 @@ static RedirEntry kRedirMap[] = {
#endif #endif
{ "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml", { "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml",
nsIAboutModule::ALLOW_SCRIPT }, nsIAboutModule::ALLOW_SCRIPT },
{ "app-manager", "chrome://browser/content/devtools/app-manager/index.xul", { "app-manager", "chrome://devtools/content/app-manager/content/index.xul",
nsIAboutModule::ALLOW_SCRIPT }, nsIAboutModule::ALLOW_SCRIPT },
{ "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xul", { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xul",
nsIAboutModule::ALLOW_SCRIPT }, nsIAboutModule::ALLOW_SCRIPT },

2
browser/components/customizableui/logging.js
View File

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

2
browser/components/downloads/DownloadsCommon.jsm
View File

@ -64,7 +64,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm"); "resource://gre/modules/Task.jsm");
XPCOMUtils.defineLazyGetter(this, "DownloadsLogger", () => { 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 = { let consoleOptions = {
maxLogLevelPref: "browser.download.loglevel", maxLogLevelPref: "browser.download.loglevel",
prefix: "Downloads" prefix: "Downloads"

2
browser/components/extensions/ext-browserAction.js
View File

@ -1,7 +1,7 @@
XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI", XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
"resource:///modules/CustomizableUI.jsm"); "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"); Cu.import("resource://gre/modules/ExtensionUtils.jsm");
var { var {

6
browser/components/loop/content/css/panel.css
View File

@ -311,7 +311,7 @@ html[dir="rtl"] .tab-view li:nth-child(2).selected ~ .slide-bar {
} }
.room-list-loading { .room-list-loading {
margin: 5rem 15px; position: relative;
text-align: center; text-align: center;
/* makes sure that buttons are anchored above footer */ /* makes sure that buttons are anchored above footer */
flex: 1; flex: 1;
@ -319,6 +319,10 @@ html[dir="rtl"] .tab-view li:nth-child(2).selected ~ .slide-bar {
.room-list-loading > img { .room-list-loading > img {
width: 66px; width: 66px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
} }

2
browser/components/loop/content/js/contacts.js
View File

@ -211,7 +211,6 @@ loop.contacts = (function(_, mozL10n) {
"video-call-item": true }), "video-call-item": true }),
"data-action": "video-call", "data-action": "video-call",
onClick: this.onItemClick}, onClick: this.onItemClick},
React.createElement("i", {className: "icon icon-video-call"}),
mozL10n.get("video_call_menu_button") mozL10n.get("video_call_menu_button")
), ),
React.createElement("li", {className: cx({ "dropdown-menu-item": true, React.createElement("li", {className: cx({ "dropdown-menu-item": true,
@ -219,7 +218,6 @@ loop.contacts = (function(_, mozL10n) {
"audio-call-item": true }), "audio-call-item": true }),
"data-action": "audio-call", "data-action": "audio-call",
onClick: this.onItemClick}, onClick: this.onItemClick},
React.createElement("i", {className: "icon icon-audio-call"}),
mozL10n.get("audio_call_menu_button") mozL10n.get("audio_call_menu_button")
), ),
React.createElement("li", {className: cx({ "dropdown-menu-item": true, React.createElement("li", {className: cx({ "dropdown-menu-item": true,

2
browser/components/loop/content/js/contacts.jsx
View File

@ -211,7 +211,6 @@ loop.contacts = (function(_, mozL10n) {
"video-call-item": true })} "video-call-item": true })}
data-action="video-call" data-action="video-call"
onClick={this.onItemClick}> onClick={this.onItemClick}>
<i className="icon icon-video-call" />
{mozL10n.get("video_call_menu_button")} {mozL10n.get("video_call_menu_button")}
</li> </li>
<li className={cx({ "dropdown-menu-item": true, <li className={cx({ "dropdown-menu-item": true,
@ -219,7 +218,6 @@ loop.contacts = (function(_, mozL10n) {
"audio-call-item": true })} "audio-call-item": true })}
data-action="audio-call" data-action="audio-call"
onClick={this.onItemClick}> onClick={this.onItemClick}>
<i className="icon icon-audio-call" />
{mozL10n.get("audio_call_menu_button")} {mozL10n.get("audio_call_menu_button")}
</li> </li>
<li className={cx({ "dropdown-menu-item": true, <li className={cx({ "dropdown-menu-item": true,

2
browser/components/loop/content/shared/img/animated-spinner.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="#0095FF"><path opacity=".15" d="M4.9 11.8c.2-.4.7-.5 1.1-.3.4.2.5.7.3 1.1l-1.2 2.1c-.2.3-.7.5-1.1.2-.4-.2-.5-.7-.3-1.1l1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite"/></path><path opacity=".2" d="M3.4 9.7c.4-.2.9-.1 1.1.3.2.4.1.9-.3 1.1l-2.1 1.2c-.4.2-.9.1-1.1-.3-.2-.4-.1-.9.3-1.1l2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.08s"/></path><path opacity=".25" d="M3.2 7.2c.4 0 .8.4.8.8s-.4.8-.8.8H.8C.4 8.8 0 8.4 0 8s.4-.8.8-.8h2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.16s"/></path><path opacity=".35" d="M1.4 5.1C1 4.9.8 4.4 1.1 4c.2-.4.7-.5 1.1-.3l2.1 1.2c.3.2.5.7.2 1.1-.2.4-.7.5-1.1.3l-2-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.24s"/></path><path opacity=".45" d="M3.7 2.2c-.2-.4-.1-.9.3-1.1.4-.2.9-.1 1.1.3l1.2 2.1c.2.3.1.8-.3 1-.4.3-.9.1-1.1-.3l-1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.32s"/></path><path opacity=".5" d="M8.8 3.2c0 .4-.4.8-.8.8s-.8-.4-.8-.8V.8c0-.4.4-.8.8-.8s.8.4.8.8v2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.40s"/></path><path opacity=".55" d="M10.9 1.4c.2-.4.7-.6 1.1-.3.4.2.5.7.3 1.1l-1.2 2.1c-.2.4-.7.5-1.1.3-.4-.3-.5-.8-.3-1.2l1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.48s"/></path><path opacity=".6" d="M13.8 3.7c.4-.2.9-.1 1.1.3.2.4.1.9-.3 1.1l-2.1 1.2c-.4.2-.9.1-1.1-.3-.2-.4-.1-.9.3-1.1l2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.56s"/></path><path opacity=".65" d="M15.2 7.2c.4 0 .8.4.8.8s-.4.8-.8.8h-2.4c-.4 0-.8-.4-.8-.8s.4-.8.8-.8h2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.64s"/></path><path opacity=".7" d="M11.8 11.1c-.4-.2-.5-.7-.3-1.1.2-.4.7-.5 1.1-.3l2.1 1.2c.4.2.5.7.3 1.1-.2.4-.7.5-1.1.3l-2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.70s"/></path><path opacity=".8" d="M9.7 12.6c-.2-.4-.1-.9.3-1.1.4-.2.9-.1 1.1.3l1.2 2.1c.2.4.1.9-.3 1.1-.4.2-.9.1-1.1-.3l-1.2-2.1z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.78s"/></path><path d="M8.8 15.2c0 .4-.4.8-.8.8s-.8-.4-.8-.8v-2.4c0-.4.4-.8.8-.8s.8.4.8.8v2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.86s"/></path></g><path fill-rule="evenodd" clip-rule="evenodd" fill="#0095FF" d="M8 8.7c-1.5 0-2.6-.5-2.6-.5S5.9 10 8 10s2.6-1.9 2.6-1.9-1.1.6-2.6.6zM9.3 6c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.3-.7-.7.3-.7.7-.7zM6.7 6c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.3-.7-.7.3-.7.7-.7z"/></svg> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="#1BAADA"><path opacity=".15" d="M4.9 11.8c.2-.4.7-.5 1.1-.3.4.2.5.7.3 1.1l-1.2 2.1c-.2.3-.7.5-1.1.2-.4-.2-.5-.7-.3-1.1l1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite"/></path><path opacity=".2" d="M3.4 9.7c.4-.2.9-.1 1.1.3.2.4.1.9-.3 1.1l-2.1 1.2c-.4.2-.9.1-1.1-.3-.2-.4-.1-.9.3-1.1l2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.08s"/></path><path opacity=".25" d="M3.2 7.2c.4 0 .8.4.8.8s-.4.8-.8.8H.8C.4 8.8 0 8.4 0 8s.4-.8.8-.8h2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.16s"/></path><path opacity=".35" d="M1.4 5.1C1 4.9.8 4.4 1.1 4c.2-.4.7-.5 1.1-.3l2.1 1.2c.3.2.5.7.2 1.1-.2.4-.7.5-1.1.3l-2-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.24s"/></path><path opacity=".45" d="M3.7 2.2c-.2-.4-.1-.9.3-1.1.4-.2.9-.1 1.1.3l1.2 2.1c.2.3.1.8-.3 1-.4.3-.9.1-1.1-.3l-1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.32s"/></path><path opacity=".5" d="M8.8 3.2c0 .4-.4.8-.8.8s-.8-.4-.8-.8V.8c0-.4.4-.8.8-.8s.8.4.8.8v2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.40s"/></path><path opacity=".55" d="M10.9 1.4c.2-.4.7-.6 1.1-.3.4.2.5.7.3 1.1l-1.2 2.1c-.2.4-.7.5-1.1.3-.4-.3-.5-.8-.3-1.2l1.2-2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.48s"/></path><path opacity=".6" d="M13.8 3.7c.4-.2.9-.1 1.1.3.2.4.1.9-.3 1.1l-2.1 1.2c-.4.2-.9.1-1.1-.3-.2-.4-.1-.9.3-1.1l2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.56s"/></path><path opacity=".65" d="M15.2 7.2c.4 0 .8.4.8.8s-.4.8-.8.8h-2.4c-.4 0-.8-.4-.8-.8s.4-.8.8-.8h2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.64s"/></path><path opacity=".7" d="M11.8 11.1c-.4-.2-.5-.7-.3-1.1.2-.4.7-.5 1.1-.3l2.1 1.2c.4.2.5.7.3 1.1-.2.4-.7.5-1.1.3l-2.1-1.2z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.70s"/></path><path opacity=".8" d="M9.7 12.6c-.2-.4-.1-.9.3-1.1.4-.2.9-.1 1.1.3l1.2 2.1c.2.4.1.9-.3 1.1-.4.2-.9.1-1.1-.3l-1.2-2.1z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.78s"/></path><path d="M8.8 15.2c0 .4-.4.8-.8.8s-.8-.4-.8-.8v-2.4c0-.4.4-.8.8-.8s.8.4.8.8v2.4z"><animate attributeType="CSS" attributeName="opacity" from="1" to=".15" dur="0.96s" repeatCount="indefinite" begin="0.86s"/></path></g><path fill-rule="evenodd" clip-rule="evenodd" fill="#1BAADA" d="M8 8.7c-1.5 0-2.6-.5-2.6-.5S5.9 10 8 10s2.6-1.9 2.6-1.9-1.1.6-2.6.6zM9.3 6c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.3-.7-.7.3-.7.7-.7zM6.7 6c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.3-.7-.7.3-.7.7-.7z"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

4
browser/components/loop/modules/LoopContacts.jsm
View File

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

2
browser/components/loop/modules/LoopRooms.jsm
View File

@ -19,7 +19,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WebChannel",
"resource://gre/modules/WebChannel.jsm"); "resource://gre/modules/WebChannel.jsm");
XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() { 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(); return new EventEmitter();
}); });
XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() { XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {

2
browser/components/loop/modules/LoopStorage.jsm
View File

@ -19,7 +19,7 @@ try {
Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() { 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(); return new EventEmitter();
}); });

2
browser/components/loop/modules/MozLoopService.jsm
View File

@ -164,7 +164,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gWM",
// Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref. // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
XPCOMUtils.defineLazyGetter(this, "log", () => { 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 = { let consoleOptions = {
maxLogLevelPref: PREF_LOG_LEVEL, maxLogLevelPref: PREF_LOG_LEVEL,
prefix: "Loop" prefix: "Loop"

2
browser/components/sessionstore/SessionFile.jsm
View File

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

2
browser/components/sessionstore/SessionSaver.jsm
View File

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

2
browser/components/sessionstore/SessionStorage.jsm
View File

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

4
browser/components/sessionstore/SessionStore.jsm
View File

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

2
browser/components/sessionstore/TabState.jsm
View File

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

2
browser/components/sessionstore/nsSessionStartup.js
View File

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

2
browser/components/uitour/UITour.jsm
View File

@ -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. // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
XPCOMUtils.defineLazyGetter(this, "log", () => { 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 = { let consoleOptions = {
maxLogLevelPref: PREF_LOG_LEVEL, maxLogLevelPref: PREF_LOG_LEVEL,
prefix: "UITour", prefix: "UITour",

24
browser/components/uitour/test/head.js
View File

@ -165,17 +165,21 @@ function promisePanelShown(win) {
} }
function promisePanelElementEvent(win, aPanel, aEvent) { function promisePanelElementEvent(win, aPanel, aEvent) {
let deferred = Promise.defer(); return new Promise((resolve, reject) => {
let timeoutId = win.setTimeout(() => { let timeoutId = win.setTimeout(() => {
deferred.reject("Event did not happen within 5 seconds."); aPanel.removeEventListener(aEvent, onPanelEvent);
}, 5000); reject("Event did not happen within 5 seconds.");
aPanel.addEventListener(aEvent, function onPanelEvent(e) { }, 5000);
aPanel.removeEventListener(aEvent, onPanelEvent);
win.clearTimeout(timeoutId); function onPanelEvent(e) {
// Wait one tick to let UITour.jsm process the event as well. aPanel.removeEventListener(aEvent, onPanelEvent);
executeSoon(deferred.resolve); win.clearTimeout(timeoutId);
// Wait one tick to let UITour.jsm process the event as well.
executeSoon(resolve);
}
aPanel.addEventListener(aEvent, onPanelEvent);
}); });
return deferred.promise;
} }
function promisePanelElementShown(win, aPanel) { function promisePanelElementShown(win, aPanel) {

15
browser/devtools/.eslintignore
View File

@ -1,15 +0,0 @@
# Ignore d3
browser/devtools/shared/d3.js
browser/devtools/webaudioeditor/lib/dagre-d3.js
# Ignore codemirror
browser/devtools/sourceeditor/codemirror/*.js
browser/devtools/sourceeditor/codemirror/**/*.js
# Ignore jquery test libs
browser/devtools/markupview/test/lib_*
# Ignore pre-processed files
browser/devtools/framework/toolbox-process-window.js
browser/devtools/performance/system.js
browser/devtools/webide/webide-prefs.js

30
browser/devtools/debugger/moz.build
View File

@ -1,30 +0,0 @@
# 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/.
EXTRA_JS_MODULES.devtools.debugger += [
'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
browser/devtools/debugger/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/eyedropper/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/fontinspector/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/framework/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/inspector/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

158
browser/devtools/jar.mn
View File

@ -1,158 +0,0 @@
# 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/.
browser.jar:
content/browser/devtools/d3.js (shared/vendor/d3.js)
content/browser/devtools/dagre-d3.js (shared/vendor/dagre-d3.js)
content/browser/devtools/widgets.css (shared/widgets/widgets.css)
content/browser/devtools/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
content/browser/devtools/markup-view.xhtml (markupview/markup-view.xhtml)
content/browser/devtools/markup-view.css (markupview/markup-view.css)
content/browser/devtools/projecteditor.xul (projecteditor/chrome/content/projecteditor.xul)
content/browser/devtools/readdir.js (projecteditor/lib/helpers/readdir.js)
content/browser/devtools/projecteditor-loader.xul (projecteditor/chrome/content/projecteditor-loader.xul)
content/browser/devtools/projecteditor-test.xul (projecteditor/chrome/content/projecteditor-test.xul)
content/browser/devtools/projecteditor-loader.js (projecteditor/chrome/content/projecteditor-loader.js)
content/browser/devtools/netmonitor.xul (netmonitor/netmonitor.xul)
content/browser/devtools/netmonitor.css (netmonitor/netmonitor.css)
content/browser/devtools/netmonitor-controller.js (netmonitor/netmonitor-controller.js)
content/browser/devtools/netmonitor-view.js (netmonitor/netmonitor-view.js)
content/browser/devtools/webconsole.xul (webconsole/webconsole.xul)
* content/browser/devtools/scratchpad.xul (scratchpad/scratchpad.xul)
content/browser/devtools/scratchpad.js (scratchpad/scratchpad.js)
content/browser/devtools/splitview.css (shared/splitview.css)
content/browser/devtools/theme-switching.js (shared/theme-switching.js)
content/browser/devtools/frame-script-utils.js (shared/frame-script-utils.js)
content/browser/devtools/styleeditor.xul (styleeditor/styleeditor.xul)
content/browser/devtools/styleeditor.css (styleeditor/styleeditor.css)
content/browser/devtools/storage.xul (storage/storage.xul)
content/browser/devtools/computedview.xhtml (styleinspector/computedview.xhtml)
content/browser/devtools/cssruleview.xhtml (styleinspector/cssruleview.xhtml)
content/browser/devtools/ruleview.css (styleinspector/ruleview.css)
content/browser/devtools/layoutview/view.js (layoutview/view.js)
content/browser/devtools/layoutview/view.xhtml (layoutview/view.xhtml)
content/browser/devtools/fontinspector/font-inspector.js (fontinspector/font-inspector.js)
content/browser/devtools/fontinspector/font-inspector.xhtml (fontinspector/font-inspector.xhtml)
content/browser/devtools/fontinspector/font-inspector.css (fontinspector/font-inspector.css)
content/browser/devtools/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
content/browser/devtools/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
content/browser/devtools/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
content/browser/devtools/codemirror/codemirror.js (sourceeditor/codemirror/codemirror.js)
content/browser/devtools/codemirror/codemirror.css (sourceeditor/codemirror/codemirror.css)
content/browser/devtools/codemirror/javascript.js (sourceeditor/codemirror/mode/javascript.js)
content/browser/devtools/codemirror/xml.js (sourceeditor/codemirror/mode/xml.js)
content/browser/devtools/codemirror/css.js (sourceeditor/codemirror/mode/css.js)
content/browser/devtools/codemirror/htmlmixed.js (sourceeditor/codemirror/mode/htmlmixed.js)
content/browser/devtools/codemirror/clike.js (sourceeditor/codemirror/mode/clike.js)
content/browser/devtools/codemirror/activeline.js (sourceeditor/codemirror/selection/active-line.js)
content/browser/devtools/codemirror/trailingspace.js (sourceeditor/codemirror/edit/trailingspace.js)
content/browser/devtools/codemirror/matchbrackets.js (sourceeditor/codemirror/edit/matchbrackets.js)
content/browser/devtools/codemirror/closebrackets.js (sourceeditor/codemirror/edit/closebrackets.js)
content/browser/devtools/codemirror/comment.js (sourceeditor/codemirror/comment/comment.js)
content/browser/devtools/codemirror/searchcursor.js (sourceeditor/codemirror/search/searchcursor.js)
content/browser/devtools/codemirror/search.js (sourceeditor/codemirror/search/search.js)
content/browser/devtools/codemirror/dialog.js (sourceeditor/codemirror/dialog/dialog.js)
content/browser/devtools/codemirror/dialog.css (sourceeditor/codemirror/dialog/dialog.css)
content/browser/devtools/codemirror/emacs.js (sourceeditor/codemirror/keymap/emacs.js)
content/browser/devtools/codemirror/sublime.js (sourceeditor/codemirror/keymap/sublime.js)
content/browser/devtools/codemirror/vim.js (sourceeditor/codemirror/keymap/vim.js)
content/browser/devtools/codemirror/foldcode.js (sourceeditor/codemirror/fold/foldcode.js)
content/browser/devtools/codemirror/brace-fold.js (sourceeditor/codemirror/fold/brace-fold.js)
content/browser/devtools/codemirror/comment-fold.js (sourceeditor/codemirror/fold/comment-fold.js)
content/browser/devtools/codemirror/xml-fold.js (sourceeditor/codemirror/fold/xml-fold.js)
content/browser/devtools/codemirror/foldgutter.js (sourceeditor/codemirror/fold/foldgutter.js)
content/browser/devtools/codemirror/tern.js (sourceeditor/codemirror/tern/tern.js)
content/browser/devtools/codemirror/show-hint.js (sourceeditor/codemirror/hint/show-hint.js)
content/browser/devtools/codemirror/mozilla.css (sourceeditor/codemirror/mozilla.css)
content/browser/devtools/debugger.xul (debugger/debugger.xul)
content/browser/devtools/debugger.css (debugger/debugger.css)
content/browser/devtools/debugger-controller.js (debugger/debugger-controller.js)
content/browser/devtools/debugger-view.js (debugger/debugger-view.js)
content/browser/devtools/debugger/workers-view.js (debugger/views/workers-view.js)
content/browser/devtools/debugger/sources-view.js (debugger/views/sources-view.js)
content/browser/devtools/debugger/variable-bubble-view.js (debugger/views/variable-bubble-view.js)
content/browser/devtools/debugger/watch-expressions-view.js (debugger/views/watch-expressions-view.js)
content/browser/devtools/debugger/global-search-view.js (debugger/views/global-search-view.js)
content/browser/devtools/debugger/toolbar-view.js (debugger/views/toolbar-view.js)
content/browser/devtools/debugger/options-view.js (debugger/views/options-view.js)
content/browser/devtools/debugger/stack-frames-view.js (debugger/views/stack-frames-view.js)
content/browser/devtools/debugger/stack-frames-classic-view.js (debugger/views/stack-frames-classic-view.js)
content/browser/devtools/debugger/filter-view.js (debugger/views/filter-view.js)
content/browser/devtools/debugger/utils.js (debugger/utils.js)
content/browser/devtools/shadereditor.xul (shadereditor/shadereditor.xul)
content/browser/devtools/shadereditor.js (shadereditor/shadereditor.js)
content/browser/devtools/canvasdebugger.xul (canvasdebugger/canvasdebugger.xul)
content/browser/devtools/canvasdebugger.js (canvasdebugger/canvasdebugger.js)
content/browser/devtools/canvasdebugger/snapshotslist.js (canvasdebugger/snapshotslist.js)
content/browser/devtools/canvasdebugger/callslist.js (canvasdebugger/callslist.js)
content/browser/devtools/webaudioeditor.xul (webaudioeditor/webaudioeditor.xul)
content/browser/devtools/webaudioeditor/includes.js (webaudioeditor/includes.js)
content/browser/devtools/webaudioeditor/models.js (webaudioeditor/models.js)
content/browser/devtools/webaudioeditor/controller.js (webaudioeditor/controller.js)
content/browser/devtools/webaudioeditor/views/utils.js (webaudioeditor/views/utils.js)
content/browser/devtools/webaudioeditor/views/context.js (webaudioeditor/views/context.js)
content/browser/devtools/webaudioeditor/views/inspector.js (webaudioeditor/views/inspector.js)
content/browser/devtools/webaudioeditor/views/properties.js (webaudioeditor/views/properties.js)
content/browser/devtools/webaudioeditor/views/automation.js (webaudioeditor/views/automation.js)
content/browser/devtools/performance.xul (performance/performance.xul)
content/browser/devtools/performance/performance-controller.js (performance/performance-controller.js)
content/browser/devtools/performance/performance-view.js (performance/performance-view.js)
content/browser/devtools/performance/views/overview.js (performance/views/overview.js)
content/browser/devtools/performance/views/toolbar.js (performance/views/toolbar.js)
content/browser/devtools/performance/views/details.js (performance/views/details.js)
content/browser/devtools/performance/views/details-subview.js (performance/views/details-abstract-subview.js)
content/browser/devtools/performance/views/details-waterfall.js (performance/views/details-waterfall.js)
content/browser/devtools/performance/views/details-js-call-tree.js (performance/views/details-js-call-tree.js)
content/browser/devtools/performance/views/details-js-flamegraph.js (performance/views/details-js-flamegraph.js)
content/browser/devtools/performance/views/details-memory-call-tree.js (performance/views/details-memory-call-tree.js)
content/browser/devtools/performance/views/details-memory-flamegraph.js (performance/views/details-memory-flamegraph.js)
content/browser/devtools/performance/views/optimizations-list.js (performance/views/optimizations-list.js)
content/browser/devtools/performance/views/recordings.js (performance/views/recordings.js)
content/browser/devtools/memory.xhtml (memory/memory.xhtml)
content/browser/devtools/memory/controller.js (memory/controller.js)
content/browser/devtools/promisedebugger/promise-controller.js (promisedebugger/promise-controller.js)
content/browser/devtools/promisedebugger/promise-panel.js (promisedebugger/promise-panel.js)
content/browser/devtools/promisedebugger/promise-debugger.xhtml (promisedebugger/promise-debugger.xhtml)
content/browser/devtools/commandline.css (commandline/commandline.css)
content/browser/devtools/commandlineoutput.xhtml (commandline/commandlineoutput.xhtml)
content/browser/devtools/commandlinetooltip.xhtml (commandline/commandlinetooltip.xhtml)
* content/browser/devtools/framework/toolbox-window.xul (framework/toolbox-window.xul)
content/browser/devtools/framework/toolbox-options.xul (framework/toolbox-options.xul)
content/browser/devtools/framework/toolbox-options.js (framework/toolbox-options.js)
content/browser/devtools/framework/toolbox.xul (framework/toolbox.xul)
content/browser/devtools/framework/options-panel.css (framework/options-panel.css)
content/browser/devtools/framework/toolbox-process-window.xul (framework/toolbox-process-window.xul)
* content/browser/devtools/framework/toolbox-process-window.js (framework/toolbox-process-window.js)
content/browser/devtools/framework/dev-edition-promo.xul (framework/dev-edition-promo/dev-edition-promo.xul)
* content/browser/devtools/framework/dev-edition-promo.css (framework/dev-edition-promo/dev-edition-promo.css)
content/browser/devtools/framework/dev-edition-logo.png (framework/dev-edition-promo/dev-edition-logo.png)
content/browser/devtools/inspector/inspector.xul (inspector/inspector.xul)
content/browser/devtools/inspector/inspector.css (inspector/inspector.css)
content/browser/devtools/connect.xhtml (framework/connect/connect.xhtml)
content/browser/devtools/connect.css (framework/connect/connect.css)
content/browser/devtools/connect.js (framework/connect/connect.js)
content/browser/devtools/app-manager/template.js (app-manager/content/template.js)
content/browser/devtools/app-manager/utils.js (app-manager/content/utils.js)
content/browser/devtools/app-manager/connection-footer.js (app-manager/content/connection-footer.js)
content/browser/devtools/app-manager/connection-footer.xhtml (app-manager/content/connection-footer.xhtml)
content/browser/devtools/app-manager/device.js (app-manager/content/device.js)
content/browser/devtools/app-manager/device.xhtml (app-manager/content/device.xhtml)
content/browser/devtools/app-manager/projects.js (app-manager/content/projects.js)
content/browser/devtools/app-manager/projects.xhtml (app-manager/content/projects.xhtml)
content/browser/devtools/app-manager/index.xul (app-manager/content/index.xul)
content/browser/devtools/app-manager/index.js (app-manager/content/index.js)
content/browser/devtools/app-manager/help.xhtml (app-manager/content/help.xhtml)
content/browser/devtools/app-manager/manifest-editor.js (app-manager/content/manifest-editor.js)
content/browser/devtools/graphs-frame.xhtml (shared/widgets/graphs-frame.xhtml)
content/browser/devtools/spectrum-frame.xhtml (shared/widgets/spectrum-frame.xhtml)
content/browser/devtools/spectrum.css (shared/widgets/spectrum.css)
content/browser/devtools/cubic-bezier-frame.xhtml (shared/widgets/cubic-bezier-frame.xhtml)
content/browser/devtools/cubic-bezier.css (shared/widgets/cubic-bezier.css)
content/browser/devtools/mdn-docs-frame.xhtml (shared/widgets/mdn-docs-frame.xhtml)
content/browser/devtools/mdn-docs.css (shared/widgets/mdn-docs.css)
content/browser/devtools/filter-frame.xhtml (shared/widgets/filter-frame.xhtml)
content/browser/devtools/filter-widget.css (shared/widgets/filter-widget.css)
content/browser/devtools/eyedropper.xul (eyedropper/eyedropper.xul)
content/browser/devtools/eyedropper/crosshairs.css (eyedropper/crosshairs.css)
content/browser/devtools/eyedropper/nocursor.css (eyedropper/nocursor.css)

4
browser/devtools/layoutview/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/markupview/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/netmonitor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

26
browser/devtools/performance/moz.build
View File

@ -1,26 +0,0 @@
# 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/.
EXTRA_JS_MODULES.devtools.performance += [
'events.js',
'modules/global.js',
'modules/logic/frame-utils.js',
'modules/logic/jit.js',
'modules/logic/marker-utils.js',
'modules/logic/telemetry.js',
'modules/logic/tree-model.js',
'modules/logic/waterfall-utils.js',
'modules/markers.js',
'modules/widgets/graphs.js',
'modules/widgets/marker-details.js',
'modules/widgets/marker-view.js',
'modules/widgets/markers-overview.js',
'modules/widgets/tree-view.js',
'modules/widgets/waterfall-ticks.js',
'panel.js'
]
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']

4
browser/devtools/performance/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

70
browser/devtools/projecteditor/moz.build
View File

@ -1,70 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# 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/.
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
EXTRA_JS_MODULES.devtools.projecteditor += [
'lib/editors.js',
'lib/project.js',
'lib/projecteditor.js',
'lib/shells.js',
'lib/tree.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.helpers += [
'lib/helpers/event.js',
'lib/helpers/file-picker.js',
'lib/helpers/l10n.js',
'lib/helpers/prompts.js',
'lib/helpers/readdir.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins += [
'lib/plugins/core.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins['app-manager'] += [
'lib/plugins/app-manager/app-project-editor.js',
'lib/plugins/app-manager/plugin.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.delete += [
'lib/plugins/delete/delete.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.dirty += [
'lib/plugins/dirty/dirty.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins['image-view'] += [
'lib/plugins/image-view/image-editor.js',
'lib/plugins/image-view/plugin.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.logging += [
'lib/plugins/logging/logging.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.new += [
'lib/plugins/new/new.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.rename += [
'lib/plugins/rename/rename.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins.save += [
'lib/plugins/save/save.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.plugins['status-bar'] += [
'lib/plugins/status-bar/plugin.js',
]
EXTRA_JS_MODULES.devtools.projecteditor.stores += [
'lib/stores/base.js',
'lib/stores/local.js',
'lib/stores/resource.js',
]

4
browser/devtools/projecteditor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/promisedebugger/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

14
browser/devtools/responsivedesign/moz.build
View File

@ -1,14 +0,0 @@
# 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/.
EXTRA_JS_MODULES.devtools += [
'responsivedesign-child.js',
'responsivedesign.jsm'
]
EXTRA_JS_MODULES.devtools.responsivedesign += [
'resize-commands.js'
]
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

4
browser/devtools/responsivedesign/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/scratchpad/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/shadereditor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

16
browser/devtools/shared/redux/moz.build
View File

@ -1,16 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# 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/.
EXTRA_JS_MODULES.devtools.shared.redux += [
'create-store.js',
'reducers.js',
]
EXTRA_JS_MODULES.devtools.shared.redux.middleware += [
'middleware/log.js',
'middleware/thunk.js',
'middleware/wait-service.js',
]

4
browser/devtools/shared/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/sourceeditor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/storage/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/styleeditor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/styleinspector/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/tilt/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/webaudioeditor/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/webconsole/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/devtools/webide/test/.eslintrc
View File

@ -1,4 +0,0 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests"
}

4
browser/installer/package-manifest.in
View File

@ -678,6 +678,10 @@
@RESPATH@/browser/chrome/webide.manifest @RESPATH@/browser/chrome/webide.manifest
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
; DevTools
@RESPATH@/browser/chrome/devtools@JAREXT@
@RESPATH@/browser/chrome/devtools.manifest
; shell icons ; shell icons
#ifdef XP_UNIX #ifdef XP_UNIX
#ifndef XP_MACOSX #ifndef XP_MACOSX

2
browser/moz.build
View File

@ -17,10 +17,10 @@ DIRS += [
'modules', 'modules',
'themes', 'themes',
'extensions', 'extensions',
'/devtools/client',
] ]
DIRS += [ DIRS += [
'devtools',
'app', 'app',
] ]

4
browser/themes/linux/browser.css
View File

@ -1762,8 +1762,8 @@ toolbarbutton.chevron > .toolbarbutton-icon {
} }
%include ../shared/fullscreen/warning.inc.css %include ../shared/fullscreen/warning.inc.css
%include ../shared/devtools/responsivedesign.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css
%include ../shared/devtools/commandline.inc.css %include ../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css %include ../shared/plugin-doorhanger.inc.css
%include ../shared/login-doorhanger.inc.css %include ../shared/login-doorhanger.inc.css

4
browser/themes/osx/browser.css
View File

@ -3312,8 +3312,8 @@ notification[value="loop-sharing-notification"] .messageImage {
} }
%include ../shared/fullscreen/warning.inc.css %include ../shared/fullscreen/warning.inc.css
%include ../shared/devtools/responsivedesign.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css
%include ../shared/devtools/commandline.inc.css %include ../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css %include ../shared/plugin-doorhanger.inc.css
%include ../shared/login-doorhanger.inc.css %include ../shared/login-doorhanger.inc.css

192
browser/themes/shared/jar.inc.mn
View File

@ -70,195 +70,3 @@
skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg) skin/classic/browser/devedition/urlbar-history-dropmarker.svg (../shared/devedition/urlbar-history-dropmarker.svg)
skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png) skin/classic/browser/devedition/urlbar-arrow.png (../shared/devedition/urlbar-arrow.png)
skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png) skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
* skin/classic/browser/devtools/common.css (../shared/devtools/common.css)
* skin/classic/browser/devtools/dark-theme.css (../shared/devtools/dark-theme.css)
* skin/classic/browser/devtools/light-theme.css (../shared/devtools/light-theme.css)
skin/classic/browser/devtools/add.svg (../shared/devtools/images/add.svg)
skin/classic/browser/devtools/filters.svg (../shared/devtools/filters.svg)
skin/classic/browser/devtools/filter-swatch.svg (../shared/devtools/images/filter-swatch.svg)
skin/classic/browser/devtools/pseudo-class.svg (../shared/devtools/images/pseudo-class.svg)
skin/classic/browser/devtools/controls.png (../shared/devtools/images/controls.png)
skin/classic/browser/devtools/controls@2x.png (../shared/devtools/images/controls@2x.png)
skin/classic/browser/devtools/animation-fast-track.svg (../shared/devtools/images/animation-fast-track.svg)
skin/classic/browser/devtools/performance-icons.svg (../shared/devtools/images/performance-icons.svg)
skin/classic/browser/devtools/newtab.png (../shared/devtools/images/newtab.png)
skin/classic/browser/devtools/newtab@2x.png (../shared/devtools/images/newtab@2x.png)
skin/classic/browser/devtools/newtab-inverted.png (../shared/devtools/images/newtab-inverted.png)
skin/classic/browser/devtools/newtab-inverted@2x.png (../shared/devtools/images/newtab-inverted@2x.png)
* skin/classic/browser/devtools/widgets.css (../shared/devtools/widgets.css)
skin/classic/browser/devtools/power.svg (../shared/devtools/images/power.svg)
skin/classic/browser/devtools/filetype-dir-close.svg (../shared/devtools/images/filetypes/dir-close.svg)
skin/classic/browser/devtools/filetype-dir-open.svg (../shared/devtools/images/filetypes/dir-open.svg)
skin/classic/browser/devtools/filetype-globe.svg (../shared/devtools/images/filetypes/globe.svg)
skin/classic/browser/devtools/filetype-store.svg (../shared/devtools/images/filetypes/store.svg)
skin/classic/browser/devtools/commandline-icon.png (../shared/devtools/images/commandline-icon.png)
skin/classic/browser/devtools/commandline-icon@2x.png (../shared/devtools/images/commandline-icon@2x.png)
skin/classic/browser/devtools/alerticon-warning.png (../shared/devtools/images/alerticon-warning.png)
skin/classic/browser/devtools/alerticon-warning@2x.png (../shared/devtools/images/alerticon-warning@2x.png)
* skin/classic/browser/devtools/ruleview.css (../shared/devtools/ruleview.css)
skin/classic/browser/devtools/commandline.css (../shared/devtools/commandline.css)
skin/classic/browser/devtools/command-paintflashing.png (../shared/devtools/images/command-paintflashing.png)
skin/classic/browser/devtools/command-paintflashing@2x.png (../shared/devtools/images/command-paintflashing@2x.png)
skin/classic/browser/devtools/command-screenshot.png (../shared/devtools/images/command-screenshot.png)
skin/classic/browser/devtools/command-screenshot@2x.png (../shared/devtools/images/command-screenshot@2x.png)
skin/classic/browser/devtools/command-responsivemode.png (../shared/devtools/images/command-responsivemode.png)
skin/classic/browser/devtools/command-responsivemode@2x.png (../shared/devtools/images/command-responsivemode@2x.png)
skin/classic/browser/devtools/command-scratchpad.png (../shared/devtools/images/command-scratchpad.png)
skin/classic/browser/devtools/command-scratchpad@2x.png (../shared/devtools/images/command-scratchpad@2x.png)
skin/classic/browser/devtools/command-tilt.png (../shared/devtools/images/command-tilt.png)
skin/classic/browser/devtools/command-tilt@2x.png (../shared/devtools/images/command-tilt@2x.png)
skin/classic/browser/devtools/command-pick.png (../shared/devtools/images/command-pick.png)
skin/classic/browser/devtools/command-pick@2x.png (../shared/devtools/images/command-pick@2x.png)
skin/classic/browser/devtools/command-frames.png (../shared/devtools/images/command-frames.png)
skin/classic/browser/devtools/command-frames@2x.png (../shared/devtools/images/command-frames@2x.png)
skin/classic/browser/devtools/command-console.png (../shared/devtools/images/command-console.png)
skin/classic/browser/devtools/command-console@2x.png (../shared/devtools/images/command-console@2x.png)
skin/classic/browser/devtools/command-eyedropper.png (../shared/devtools/images/command-eyedropper.png)
skin/classic/browser/devtools/command-eyedropper@2x.png (../shared/devtools/images/command-eyedropper@2x.png)
skin/classic/browser/devtools/command-rulers.png (../shared/devtools/images/command-rulers.png)
skin/classic/browser/devtools/command-rulers@2x.png (../shared/devtools/images/command-rulers@2x.png)
skin/classic/browser/devtools/markup-view.css (../shared/devtools/markup-view.css)
skin/classic/browser/devtools/editor-error.png (../shared/devtools/images/editor-error.png)
skin/classic/browser/devtools/editor-breakpoint.png (../shared/devtools/images/editor-breakpoint.png)
skin/classic/browser/devtools/editor-breakpoint@2x.png (../shared/devtools/images/editor-breakpoint@2x.png)
skin/classic/browser/devtools/editor-debug-location.png (../shared/devtools/images/editor-debug-location.png)
skin/classic/browser/devtools/editor-debug-location@2x.png (../shared/devtools/images/editor-debug-location@2x.png)
* skin/classic/browser/devtools/webconsole.css (../shared/devtools/webconsole.css)
skin/classic/browser/devtools/webconsole.svg (../shared/devtools/images/webconsole.svg)
skin/classic/browser/devtools/breadcrumbs-divider@2x.png (../shared/devtools/images/breadcrumbs-divider@2x.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton.png (../shared/devtools/images/breadcrumbs-scrollbutton.png)
skin/classic/browser/devtools/breadcrumbs-scrollbutton@2x.png (../shared/devtools/images/breadcrumbs-scrollbutton@2x.png)
skin/classic/browser/devtools/animationinspector.css (../shared/devtools/animationinspector.css)
skin/classic/browser/devtools/eyedropper.css (../shared/devtools/eyedropper.css)
* skin/classic/browser/devtools/canvasdebugger.css (../shared/devtools/canvasdebugger.css)
skin/classic/browser/devtools/debugger.css (../shared/devtools/debugger.css)
* skin/classic/browser/devtools/netmonitor.css (../shared/devtools/netmonitor.css)
skin/classic/browser/devtools/performance.css (../shared/devtools/performance.css)
skin/classic/browser/devtools/memory.css (../shared/devtools/memory.css)
skin/classic/browser/devtools/promisedebugger.css (../shared/devtools/promisedebugger.css)
skin/classic/browser/devtools/timeline-filter.svg (../shared/devtools/images/timeline-filter.svg)
* skin/classic/browser/devtools/scratchpad.css (../shared/devtools/scratchpad.css)
skin/classic/browser/devtools/shadereditor.css (../shared/devtools/shadereditor.css)
skin/classic/browser/devtools/storage.css (../shared/devtools/storage.css)
* skin/classic/browser/devtools/splitview.css (../shared/devtools/splitview.css)
skin/classic/browser/devtools/styleeditor.css (../shared/devtools/styleeditor.css)
skin/classic/browser/devtools/webaudioeditor.css (../shared/devtools/webaudioeditor.css)
skin/classic/browser/devtools/magnifying-glass.png (../shared/devtools/images/magnifying-glass.png)
skin/classic/browser/devtools/magnifying-glass@2x.png (../shared/devtools/images/magnifying-glass@2x.png)
skin/classic/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
skin/classic/browser/devtools/itemToggle.png (../shared/devtools/images/itemToggle.png)
skin/classic/browser/devtools/itemToggle@2x.png (../shared/devtools/images/itemToggle@2x.png)
skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
skin/classic/browser/devtools/itemArrow-rtl.svg (../shared/devtools/images/itemArrow-rtl.svg)
skin/classic/browser/devtools/itemArrow-ltr.svg (../shared/devtools/images/itemArrow-ltr.svg)
skin/classic/browser/devtools/noise.png (../shared/devtools/images/noise.png)
skin/classic/browser/devtools/dropmarker.svg (../shared/devtools/images/dropmarker.svg)
skin/classic/browser/devtools/layoutview.css (../shared/devtools/layoutview.css)
skin/classic/browser/devtools/debugger-collapse.png (../shared/devtools/images/debugger-collapse.png)
skin/classic/browser/devtools/debugger-collapse@2x.png (../shared/devtools/images/debugger-collapse@2x.png)
skin/classic/browser/devtools/debugger-expand.png (../shared/devtools/images/debugger-expand.png)
skin/classic/browser/devtools/debugger-expand@2x.png (../shared/devtools/images/debugger-expand@2x.png)
skin/classic/browser/devtools/debugger-pause.png (../shared/devtools/images/debugger-pause.png)
skin/classic/browser/devtools/debugger-pause@2x.png (../shared/devtools/images/debugger-pause@2x.png)
skin/classic/browser/devtools/debugger-play.png (../shared/devtools/images/debugger-play.png)
skin/classic/browser/devtools/debugger-play@2x.png (../shared/devtools/images/debugger-play@2x.png)
skin/classic/browser/devtools/fast-forward.png (../shared/devtools/images/fast-forward.png)
skin/classic/browser/devtools/fast-forward@2x.png (../shared/devtools/images/fast-forward@2x.png)
skin/classic/browser/devtools/rewind.png (../shared/devtools/images/rewind.png)
skin/classic/browser/devtools/rewind@2x.png (../shared/devtools/images/rewind@2x.png)
skin/classic/browser/devtools/debugger-step-in.png (../shared/devtools/images/debugger-step-in.png)
skin/classic/browser/devtools/debugger-step-in@2x.png (../shared/devtools/images/debugger-step-in@2x.png)
skin/classic/browser/devtools/debugger-step-out.png (../shared/devtools/images/debugger-step-out.png)
skin/classic/browser/devtools/debugger-step-out@2x.png (../shared/devtools/images/debugger-step-out@2x.png)
skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
skin/classic/browser/devtools/debugger-blackbox.png (../shared/devtools/images/debugger-blackbox.png)
skin/classic/browser/devtools/debugger-blackbox@2x.png (../shared/devtools/images/debugger-blackbox@2x.png)
skin/classic/browser/devtools/debugger-prettyprint.png (../shared/devtools/images/debugger-prettyprint.png)
skin/classic/browser/devtools/debugger-prettyprint@2x.png (../shared/devtools/images/debugger-prettyprint@2x.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
skin/classic/browser/devtools/tracer-icon.png (../shared/devtools/images/tracer-icon.png)
skin/classic/browser/devtools/tracer-icon@2x.png (../shared/devtools/images/tracer-icon@2x.png)
skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsivemode/responsive-se-resizer.png)
skin/classic/browser/devtools/responsive-se-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-se-resizer@2x.png)
skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer.png)
skin/classic/browser/devtools/responsive-vertical-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-vertical-resizer@2x.png)
skin/classic/browser/devtools/responsive-horizontal-resizer.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer.png)
skin/classic/browser/devtools/responsive-horizontal-resizer@2x.png (../shared/devtools/images/responsivemode/responsive-horizontal-resizer@2x.png)
skin/classic/browser/devtools/responsiveui-rotate.png (../shared/devtools/images/responsivemode/responsiveui-rotate.png)
skin/classic/browser/devtools/responsiveui-rotate@2x.png (../shared/devtools/images/responsivemode/responsiveui-rotate@2x.png)
skin/classic/browser/devtools/responsiveui-touch.png (../shared/devtools/images/responsivemode/responsiveui-touch.png)
skin/classic/browser/devtools/responsiveui-touch@2x.png (../shared/devtools/images/responsivemode/responsiveui-touch@2x.png)
skin/classic/browser/devtools/responsiveui-screenshot.png (../shared/devtools/images/responsivemode/responsiveui-screenshot.png)
skin/classic/browser/devtools/responsiveui-screenshot@2x.png (../shared/devtools/images/responsivemode/responsiveui-screenshot@2x.png)
skin/classic/browser/devtools/toggle-tools.png (../shared/devtools/images/toggle-tools.png)
skin/classic/browser/devtools/toggle-tools@2x.png (../shared/devtools/images/toggle-tools@2x.png)
skin/classic/browser/devtools/dock-bottom@2x.png (../shared/devtools/images/dock-bottom@2x.png)
skin/classic/browser/devtools/dock-bottom-minimize@2x.png (../shared/devtools/images/dock-bottom-minimize@2x.png)
skin/classic/browser/devtools/dock-bottom-maximize@2x.png (../shared/devtools/images/dock-bottom-maximize@2x.png)
skin/classic/browser/devtools/dock-side@2x.png (../shared/devtools/images/dock-side@2x.png)
* skin/classic/browser/devtools/floating-scrollbars.css (../shared/devtools/floating-scrollbars.css)
skin/classic/browser/devtools/floating-scrollbars-light.css (../shared/devtools/floating-scrollbars-light.css)
* skin/classic/browser/devtools/inspector.css (../shared/devtools/inspector.css)
skin/classic/browser/devtools/profiler-stopwatch.svg (../shared/devtools/images/profiler-stopwatch.svg)
skin/classic/browser/devtools/profiler-stopwatch-checked.svg (../shared/devtools/images/profiler-stopwatch-checked.svg)
skin/classic/browser/devtools/tool-options.svg (../shared/devtools/images/tool-options.svg)
skin/classic/browser/devtools/tool-webconsole.svg (../shared/devtools/images/tool-webconsole.svg)
skin/classic/browser/devtools/tool-debugger.svg (../shared/devtools/images/tool-debugger.svg)
skin/classic/browser/devtools/tool-debugger-paused.svg (../shared/devtools/images/tool-debugger-paused.svg)
skin/classic/browser/devtools/tool-inspector.svg (../shared/devtools/images/tool-inspector.svg)
skin/classic/browser/devtools/tool-shadereditor.svg (../shared/devtools/images/tool-shadereditor.svg)
skin/classic/browser/devtools/tool-styleeditor.svg (../shared/devtools/images/tool-styleeditor.svg)
skin/classic/browser/devtools/tool-storage.svg (../shared/devtools/images/tool-storage.svg)
skin/classic/browser/devtools/tool-profiler.svg (../shared/devtools/images/tool-profiler.svg)
skin/classic/browser/devtools/tool-profiler-active.svg (../shared/devtools/images/tool-profiler-active.svg)
skin/classic/browser/devtools/tool-network.svg (../shared/devtools/images/tool-network.svg)
skin/classic/browser/devtools/tool-scratchpad.svg (../shared/devtools/images/tool-scratchpad.svg)
skin/classic/browser/devtools/tool-webaudio.svg (../shared/devtools/images/tool-webaudio.svg)
skin/classic/browser/devtools/close.png (../shared/devtools/images/close.png)
skin/classic/browser/devtools/close@2x.png (../shared/devtools/images/close@2x.png)
skin/classic/browser/devtools/vview-delete.png (../shared/devtools/images/vview-delete.png)
skin/classic/browser/devtools/vview-delete@2x.png (../shared/devtools/images/vview-delete@2x.png)
skin/classic/browser/devtools/vview-edit.png (../shared/devtools/images/vview-edit.png)
skin/classic/browser/devtools/vview-edit@2x.png (../shared/devtools/images/vview-edit@2x.png)
skin/classic/browser/devtools/vview-lock.png (../shared/devtools/images/vview-lock.png)
skin/classic/browser/devtools/vview-lock@2x.png (../shared/devtools/images/vview-lock@2x.png)
skin/classic/browser/devtools/vview-open-inspector.png (../shared/devtools/images/vview-open-inspector.png)
skin/classic/browser/devtools/vview-open-inspector@2x.png (../shared/devtools/images/vview-open-inspector@2x.png)
skin/classic/browser/devtools/cubic-bezier-swatch.png (../shared/devtools/images/cubic-bezier-swatch.png)
skin/classic/browser/devtools/cubic-bezier-swatch@2x.png (../shared/devtools/images/cubic-bezier-swatch@2x.png)
skin/classic/browser/devtools/undock@2x.png (../shared/devtools/images/undock@2x.png)
skin/classic/browser/devtools/font-inspector.css (../shared/devtools/font-inspector.css)
skin/classic/browser/devtools/computedview.css (../shared/devtools/computedview.css)
skin/classic/browser/devtools/arrow-e.png (../shared/devtools/images/arrow-e.png)
skin/classic/browser/devtools/arrow-e@2x.png (../shared/devtools/images/arrow-e@2x.png)
skin/classic/browser/devtools/responsiveui-home.png (../shared/devtools/responsiveui-home.png)
skin/classic/browser/devtools/projecteditor/projecteditor.css (../shared/devtools/projecteditor/projecteditor.css)
skin/classic/browser/devtools/app-manager/connection-footer.css (../shared/devtools/app-manager/connection-footer.css)
skin/classic/browser/devtools/app-manager/index.css (../shared/devtools/app-manager/index.css)
skin/classic/browser/devtools/app-manager/device.css (../shared/devtools/app-manager/device.css)
skin/classic/browser/devtools/app-manager/projects.css (../shared/devtools/app-manager/projects.css)
skin/classic/browser/devtools/app-manager/help.css (../shared/devtools/app-manager/help.css)
skin/classic/browser/devtools/app-manager/warning.svg (../shared/devtools/app-manager/images/warning.svg)
skin/classic/browser/devtools/app-manager/error.svg (../shared/devtools/app-manager/images/error.svg)
skin/classic/browser/devtools/app-manager/plus.svg (../shared/devtools/app-manager/images/plus.svg)
skin/classic/browser/devtools/app-manager/remove.svg (../shared/devtools/app-manager/images/remove.svg)
skin/classic/browser/devtools/app-manager/add.svg (../shared/devtools/app-manager/images/add.svg)
skin/classic/browser/devtools/app-manager/index-icons.svg (../shared/devtools/app-manager/images/index-icons.svg)
skin/classic/browser/devtools/app-manager/rocket.svg (../shared/devtools/app-manager/images/rocket.svg)
skin/classic/browser/devtools/app-manager/noise.png (../shared/devtools/app-manager/images/noise.png)
skin/classic/browser/devtools/app-manager/default-app-icon.png (../shared/devtools/app-manager/images/default-app-icon.png)
skin/classic/browser/devtools/search-clear-failed.svg (../shared/devtools/images/search-clear-failed.svg)
skin/classic/browser/devtools/search-clear-light.svg (../shared/devtools/images/search-clear-light.svg)
skin/classic/browser/devtools/search-clear-dark.svg (../shared/devtools/images/search-clear-dark.svg)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png (../shared/devtools/tooltip/arrow-horizontal-dark.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png (../shared/devtools/tooltip/arrow-vertical-dark.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png (../shared/devtools/tooltip/arrow-horizontal-light.png)
skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light.png (../shared/devtools/tooltip/arrow-vertical-light.png)
skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png (../shared/devtools/tooltip/arrow-vertical-light@2x.png)

4
browser/themes/windows/browser.css
View File

@ -2514,8 +2514,8 @@ notification[value="loop-sharing-notification"] .messageImage {
} }
%include ../shared/fullscreen/warning.inc.css %include ../shared/fullscreen/warning.inc.css
%include ../shared/devtools/responsivedesign.inc.css %include ../../../devtools/client/themes/responsivedesign.inc.css
%include ../shared/devtools/commandline.inc.css %include ../../../devtools/client/themes/commandline.inc.css
%include ../shared/plugin-doorhanger.inc.css %include ../shared/plugin-doorhanger.inc.css
%include ../shared/login-doorhanger.inc.css %include ../shared/login-doorhanger.inc.css

4
build/dumbmake-dependencies
View File

@ -51,7 +51,7 @@ toolkit/library
browser/app browser/app
browser/base browser/base
browser/components browser/components
browser/devtools devtools/client
browser/locales browser/locales
browser/modules browser/modules
browser/themes browser/themes
@ -60,7 +60,7 @@ browser/app
toolkit/components/jsdownloads toolkit/components/jsdownloads
toolkit/content toolkit/content
toolkit/crashreporter toolkit/crashreporter
toolkit/devtools devtools/shared
toolkit/forgetaboutsite toolkit/forgetaboutsite
toolkit/identity toolkit/identity
toolkit/modules toolkit/modules

22
devtools/.eslintignore Normal file
View File

@ -0,0 +1,22 @@
# Ignore d3
client/shared/d3.js
client/webaudioeditor/lib/dagre-d3.js
# Ignore codemirror
client/sourceeditor/codemirror/*.js
client/sourceeditor/codemirror/**/*.js
# Ignore jquery test libs
client/markupview/test/lib_*
# Ignore pre-processed files
client/framework/toolbox-process-window.js
client/performance/system.js
client/webide/webide-prefs.js
# Ignore various libs
shared/jsbeautify/*
shared/acorn/*
shared/tern/*
shared/pretty-fast/*
shared/sourcemap/*

2
browser/devtools/.eslintrc → devtools/.eslintrc
View File

@ -328,7 +328,7 @@
// Warn about invalid JSDoc comments. // Warn about invalid JSDoc comments.
// Disabled for now because of https://github.com/eslint/eslint/issues/2270 // Disabled for now because of https://github.com/eslint/eslint/issues/2270
// The rule fails on some jsdoc comments like in: // The rule fails on some jsdoc comments like in:
// browser/devtools/webconsole/console-output.js // devtools/client/webconsole/console-output.js
"valid-jsdoc": 0, "valid-jsdoc": 0,
// Ensure that the results of typeof are compared against a valid string. // Ensure that the results of typeof are compared against a valid string.
"valid-typeof": 2, "valid-typeof": 2,

0
browser/devtools/.eslintrc.mochitests → devtools/.eslintrc.mochitests
View File

0
browser/devtools/.eslintrc.xpcshell → devtools/.eslintrc.xpcshell
View File

8
browser/devtools/animationinspector/animation-controller.js → devtools/client/animationinspector/animation-controller.js
View File

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

6
browser/devtools/animationinspector/animation-inspector.xhtml → devtools/client/animationinspector/animation-inspector.xhtml
View File

@ -10,9 +10,9 @@
<head> <head>
<title>&title;</title> <title>&title;</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href="chrome://browser/skin/devtools/common.css" type="text/css"/> <link rel="stylesheet" href="chrome://devtools/skin/themes/common.css" type="text/css"/>
<link rel="stylesheet" href="chrome://browser/skin/devtools/animationinspector.css" type="text/css"/> <link rel="stylesheet" href="chrome://devtools/skin/themes/animationinspector.css" type="text/css"/>
<script type="application/javascript;version=1.8" src="chrome://browser/content/devtools/theme-switching.js"/> <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
</head> </head>
<body class="theme-sidebar devtools-monospace" role="application" empty="true"> <body class="theme-sidebar devtools-monospace" role="application" empty="true">
<div id="global-toolbar" class="theme-toolbar"> <div id="global-toolbar" class="theme-toolbar">

2
browser/devtools/animationinspector/animation-panel.js → devtools/client/animationinspector/animation-panel.js
View File

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

4
browser/devtools/animationinspector/components.js → devtools/client/animationinspector/components.js
View File

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

4
browser/devtools/animationinspector/moz.build → devtools/client/animationinspector/moz.build
View File

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

2
browser/devtools/commandline/test/.eslintrc → devtools/client/animationinspector/test/.eslintrc
View File

@ -1,4 +1,4 @@
{ {
// Extend from the shared list of defined globals for mochitests. // Extend from the shared list of defined globals for mochitests.
"extends": "../../.eslintrc.mochitests" "extends": "../../../.eslintrc.mochitests"
} }

0
browser/devtools/animationinspector/test/browser.ini → devtools/client/animationinspector/test/browser.ini
View File

0
browser/devtools/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js → devtools/client/animationinspector/test/browser_animation_controller_exposes_document_currentTime.js
View File

0
browser/devtools/animationinspector/test/browser_animation_empty_on_invalid_nodes.js → devtools/client/animationinspector/test/browser_animation_empty_on_invalid_nodes.js
View File

0
browser/devtools/animationinspector/test/browser_animation_mutations_with_same_names.js → devtools/client/animationinspector/test/browser_animation_mutations_with_same_names.js
View File

0
browser/devtools/animationinspector/test/browser_animation_panel_exists.js → devtools/client/animationinspector/test/browser_animation_panel_exists.js
View File

0
browser/devtools/animationinspector/test/browser_animation_participate_in_inspector_update.js → devtools/client/animationinspector/test/browser_animation_participate_in_inspector_update.js
View File

0
browser/devtools/animationinspector/test/browser_animation_playerFronts_are_refreshed.js → devtools/client/animationinspector/test/browser_animation_playerFronts_are_refreshed.js
View File

0
browser/devtools/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js → devtools/client/animationinspector/test/browser_animation_playerWidgets_appear_on_panel_init.js
View File

Some files were not shown because too many files have changed in this diff Show More