Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fx-team to central, a=merge

Browse Source
This commit is contained in:
Wes Kocher 2016-09-19 15:53:05 -07:00
commit dbbbafc979
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devtools/client/framework/toolbox-process-window.xul
View File

@ -41,5 +41,7 @@
<box>&browserToolboxErrorMessage;</box>
<textbox multiline="true" id="error-message" flex="1"></textbox>
</vbox>
<iframe id="toolbox-iframe" flex="1"></iframe>
<tooltip id="aHTMLTooltip" page="true"/>
<iframe id="toolbox-iframe" flex="1" tooltip="aHTMLTooltip"></iframe>
</window>

2
devtools/server/actors/pretty-print-worker.js
View File

@ -28,7 +28,7 @@
*/
importScripts("resource://devtools/shared/worker/helper.js");
importScripts("resource://devtools/acorn/acorn.js");
importScripts("resource://devtools/shared/acorn/acorn.js");
importScripts("resource://devtools/shared/sourcemap/source-map.js");
importScripts("resource://devtools/shared/pretty-fast/pretty-fast.js");

4
devtools/shared/Loader.jsm
View File

@ -44,9 +44,9 @@ BuiltinProvider.prototype = {
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"gcli": "resource://devtools/shared/gcli/source/lib/gcli",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"acorn": "resource://devtools/acorn",
"acorn": "resource://devtools/shared/acorn",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"acorn/util/walk": "resource://devtools/acorn/walk.js",
"acorn/util/walk": "resource://devtools/shared/acorn/walk.js",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"source-map": "resource://devtools/shared/sourcemap/source-map.js",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠

4
devtools/shared/acorn/moz.build
View File

@ -6,8 +6,8 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.acorn += [
DevToolsModules(
'acorn.js',
'acorn_loose.js',
'walk.js',
]
)