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

Backed out changeset c8f8a1b5dfeb (bug 1338567) for merge conflicts

Browse Source
This commit is contained in:
Phil Ringnalda 2017-02-12 15:21:00 -08:00
parent 447fa1b7be
commit 1057c1089e
17 changed files with 39411 additions and 56468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2016
devtools/client/debugger/new/debugger.css
View File

File diff suppressed because it is too large Load Diff

52551
devtools/client/debugger/new/debugger.js
View File

File diff suppressed because one or more lines are too long

4
devtools/client/debugger/new/index.html
View File

@ -21,11 +21,11 @@
src="chrome://devtools/content/shared/theme-switching.js"></script>
<script type="text/javascript">
const { BrowserLoader } = Components.utils.import("resource://devtools/client/shared/browser-loader.js", {});
const { require } = BrowserLoader({
const { require: devtoolsRequire } = BrowserLoader({
baseURI: "resource://devtools/client/debugger/new/",
window,
});
Debugger = require("devtools/client/debugger/new/debugger");
</script>
<script type="text/javascript" src="resource://devtools/client/debugger/new/debugger.js"></script>
</body>
</html>

40718
devtools/client/debugger/new/integration-tests.js
View File

File diff suppressed because one or more lines are too long

1
devtools/client/debugger/new/moz.build
View File

@ -6,7 +6,6 @@
DevToolsModules(
'debugger.css',
'debugger.js',
'integration-tests.js',
'panel.js',
'pretty-print-worker.js',
'source-map-worker.js'

119
devtools/client/debugger/new/pretty-print-worker.js
View File

@ -1,19 +1,34 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else {
var a = factory();
for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
}
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
var Debugger =
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/ // SingleModulePlugin
/******/ const smpCache = this.smpCache = this.smpCache || {};
/******/ const smpMap = this.smpMap = this.smpMap || new Map();
/******/ function sanitizeString(text) {
/******/ return text.replace(/__webpack_require__\(\d+\)/g,"");
/******/ }
/******/ function getModuleBody(id) {
/******/ if (smpCache.hasOwnProperty(id)) {
/******/ return smpCache[id];
/******/ }
/******/
/******/ const body = sanitizeString(String(modules[id]));
/******/ smpCache[id] = body;
/******/ return body;
/******/ }
/******/ if (!installedModules[moduleId]) {
/******/ const body = getModuleBody(moduleId);
/******/ if (smpMap.has(body)) {
/******/ installedModules[moduleId] = installedModules[smpMap.get(body)];
/******/ }
/******/ else {
/******/ smpMap.set(body, moduleId)
/******/ }
/******/ }
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
@ -55,19 +70,17 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ 0:
/***/ function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(527);
module.exports = __webpack_require__(679);
/***/ },
/***/ 197:
/***/ 252:
/***/ function(module, exports) {
"use strict";
function assert(condition, message) {
if (!condition) {
throw new Error(`Assertion failure: ${message}`);
throw new Error(`Assertion failure: ${ message }`);
}
}
@ -75,13 +88,11 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 527:
/***/ 679:
/***/ function(module, exports, __webpack_require__) {
"use strict";
var prettyFast = __webpack_require__(528);
var assert = __webpack_require__(197);
var prettyFast = __webpack_require__(680);
var assert = __webpack_require__(252);
function prettyPrint(_ref) {
var url = _ref.url,
@ -99,7 +110,7 @@ return /******/ (function(modules) { // webpackBootstrap
mappings: prettified.map._mappings
};
} catch (e) {
throw new Error(`${e.message}\n${e.stack}`);
return new Error(`${ e.message }\n${ e.stack }`);
}
}
@ -145,7 +156,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 528:
/***/ 680:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/* -*- indent-tabs-mode: nil; js-indent-level: 2; fill-column: 80 -*- */
@ -167,8 +178,8 @@ return /******/ (function(modules) { // webpackBootstrap
}(this, function () {
"use strict";
var acorn = this.acorn || __webpack_require__(529);
var sourceMap = this.sourceMap || __webpack_require__(530);
var acorn = this.acorn || __webpack_require__(681);
var sourceMap = this.sourceMap || __webpack_require__(682);
var SourceNode = sourceMap.SourceNode;
// If any of these tokens are seen before a "[" token, we know that "[" token
@ -1027,7 +1038,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 529:
/***/ 681:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Acorn is a tiny, fast JavaScript parser written in JavaScript.
@ -3687,7 +3698,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 530:
/***/ 682:
/***/ function(module, exports, __webpack_require__) {
/*
@ -3695,14 +3706,14 @@ return /******/ (function(modules) { // webpackBootstrap
* Licensed under the New BSD license. See LICENSE.txt or:
* http://opensource.org/licenses/BSD-3-Clause
*/
exports.SourceMapGenerator = __webpack_require__(531).SourceMapGenerator;
exports.SourceMapConsumer = __webpack_require__(537).SourceMapConsumer;
exports.SourceNode = __webpack_require__(539).SourceNode;
exports.SourceMapGenerator = __webpack_require__(683).SourceMapGenerator;
exports.SourceMapConsumer = __webpack_require__(689).SourceMapConsumer;
exports.SourceNode = __webpack_require__(691).SourceNode;
/***/ },
/***/ 531:
/***/ 683:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3716,10 +3727,10 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var base64VLQ = __webpack_require__(532);
var util = __webpack_require__(534);
var ArraySet = __webpack_require__(535).ArraySet;
var MappingList = __webpack_require__(536).MappingList;
var base64VLQ = __webpack_require__(684);
var util = __webpack_require__(686);
var ArraySet = __webpack_require__(687).ArraySet;
var MappingList = __webpack_require__(688).MappingList;
/**
* An instance of the SourceMapGenerator represents a source map which is
@ -4109,7 +4120,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 532:
/***/ 684:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4153,7 +4164,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var base64 = __webpack_require__(533);
var base64 = __webpack_require__(685);
// A single base 64 digit can contain 6 bits of data. For the base 64 variable
// length quantities we use in the source map spec, the first bit is the sign,
@ -4258,7 +4269,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 533:
/***/ 685:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4307,7 +4318,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 534:
/***/ 686:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4633,7 +4644,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 535:
/***/ 687:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4647,7 +4658,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var util = __webpack_require__(534);
var util = __webpack_require__(686);
/**
* A data structure which is a combination of an array and a set. Adding a new
@ -4737,7 +4748,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 536:
/***/ 688:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4751,7 +4762,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var util = __webpack_require__(534);
var util = __webpack_require__(686);
/**
* Determine whether mappingB is after mappingA with respect to generated
@ -4830,7 +4841,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 537:
/***/ 689:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -4844,10 +4855,10 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var util = __webpack_require__(534);
var binarySearch = __webpack_require__(538);
var ArraySet = __webpack_require__(535).ArraySet;
var base64VLQ = __webpack_require__(532);
var util = __webpack_require__(686);
var binarySearch = __webpack_require__(690);
var ArraySet = __webpack_require__(687).ArraySet;
var base64VLQ = __webpack_require__(684);
/**
* A SourceMapConsumer instance represents a parsed source map which we can
@ -5412,7 +5423,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 538:
/***/ 690:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -5499,7 +5510,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 539:
/***/ 691:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
@ -5513,8 +5524,8 @@ return /******/ (function(modules) { // webpackBootstrap
}
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
var SourceMapGenerator = __webpack_require__(531).SourceMapGenerator;
var util = __webpack_require__(534);
var SourceMapGenerator = __webpack_require__(683).SourceMapGenerator;
var util = __webpack_require__(686);
// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
// operating systems these days (capturing the result).
@ -5920,7 +5931,5 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ }
/******/ })
});
;
/******/ });
//# sourceMappingURL=pretty-print-worker.js.map

208
devtools/client/debugger/new/source-map-worker.js
View File

@ -1,19 +1,34 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else {
var a = factory();
for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
}
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
var Debugger =
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/ // SingleModulePlugin
/******/ const smpCache = this.smpCache = this.smpCache || {};
/******/ const smpMap = this.smpMap = this.smpMap || new Map();
/******/ function sanitizeString(text) {
/******/ return text.replace(/__webpack_require__\(\d+\)/g,"");
/******/ }
/******/ function getModuleBody(id) {
/******/ if (smpCache.hasOwnProperty(id)) {
/******/ return smpCache[id];
/******/ }
/******/
/******/ const body = sanitizeString(String(modules[id]));
/******/ smpCache[id] = body;
/******/ return body;
/******/ }
/******/ if (!installedModules[moduleId]) {
/******/ const body = getModuleBody(moduleId);
/******/ if (smpMap.has(body)) {
/******/ installedModules[moduleId] = installedModules[smpMap.get(body)];
/******/ }
/******/ else {
/******/ smpMap.set(body, moduleId)
/******/ }
/******/ }
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
@ -55,7 +70,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ 0:
/***/ function(module, exports, __webpack_require__) {
module.exports = __webpack_require__(540);
module.exports = __webpack_require__(692);
/***/ },
@ -77,7 +92,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 127:
/***/ 125:
/***/ function(module, exports) {
function networkRequest(url, opts) {
@ -113,11 +128,9 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 195:
/***/ 250:
/***/ function(module, exports) {
"use strict";
var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
@ -168,7 +181,7 @@ return /******/ (function(modules) { // webpackBootstrap
*/
function truncateStr(str, size) {
if (str.length > size) {
return `${str.slice(0, size)}...`;
return `${ str.slice(0, size) }...`;
}
return str;
}
@ -179,7 +192,7 @@ return /******/ (function(modules) { // webpackBootstrap
*/
function endTruncateStr(str, size) {
if (str.length > size) {
return `...${str.slice(str.length - size)}`;
return `...${ str.slice(str.length - size) }`;
}
return str;
}
@ -343,10 +356,6 @@ return /******/ (function(modules) { // webpackBootstrap
};
}
function waitForMs(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
module.exports = {
handleError,
promisify,
@ -359,20 +368,17 @@ return /******/ (function(modules) { // webpackBootstrap
mapObject,
compose,
updateObj,
throttle,
waitForMs
throttle
};
/***/ },
/***/ 197:
/***/ 252:
/***/ function(module, exports) {
"use strict";
function assert(condition, message) {
if (!condition) {
throw new Error(`Assertion failure: ${message}`);
throw new Error(`Assertion failure: ${ message }`);
}
}
@ -380,20 +386,20 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 207:
/***/ 295:
/***/ function(module, exports, __webpack_require__) {
"use strict";
/**
* Utils for working with Source URLs
* @module utils/source
*/
var _require = __webpack_require__(195),
var _require = __webpack_require__(250),
endTruncateStr = _require.endTruncateStr;
var _require2 = __webpack_require__(208),
var _require2 = __webpack_require__(296),
basename = _require2.basename;
/**
@ -441,7 +447,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @static
*/
function getPrettySourceURL(url) {
return `${url}:formatted`;
return `${ url }:formatted`;
}
/**
@ -465,7 +471,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (!url) {
var sourceId = id.split("/")[1];
return `SOURCE${sourceId}`;
return `SOURCE${ sourceId }`;
}
url = getRawSourceURL(url || "");
@ -563,11 +569,9 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 208:
/***/ 296:
/***/ function(module, exports) {
"use strict";
function basename(path) {
return path.split("/").pop();
}
@ -586,7 +590,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
function join(base, dir) {
return `${base}/${dir}`;
return `${ base }/${ dir }`;
}
module.exports = {
@ -595,12 +599,10 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 220:
/***/ 317:
/***/ function(module, exports, __webpack_require__) {
"use strict";
var md5 = __webpack_require__(221);
var md5 = __webpack_require__(318);
function originalToGeneratedId(originalId) {
var match = originalId.match(/(.*)\/originalSource/);
@ -608,7 +610,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
function generatedToOriginalId(generatedId, url) {
return `${generatedId}/originalSource-${md5(url)}`;
return `${ generatedId }/originalSource-${ md5(url) }`;
}
function isOriginalId(id) {
@ -625,14 +627,14 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 221:
/***/ 318:
/***/ function(module, exports, __webpack_require__) {
(function(){
var crypt = __webpack_require__(222),
utf8 = __webpack_require__(223).utf8,
isBuffer = __webpack_require__(224),
bin = __webpack_require__(223).bin,
var crypt = __webpack_require__(319),
utf8 = __webpack_require__(320).utf8,
isBuffer = __webpack_require__(321),
bin = __webpack_require__(320).bin,
// The core
md5 = function (message, options) {
@ -792,7 +794,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 222:
/***/ 319:
/***/ function(module, exports) {
(function() {
@ -895,7 +897,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 223:
/***/ 320:
/***/ function(module, exports) {
var charenc = {
@ -935,7 +937,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 224:
/***/ 321:
/***/ function(module, exports) {
/*!
@ -963,7 +965,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 262:
/***/ 398:
/***/ function(module, exports, __webpack_require__) {
// Copyright Joyent, Inc. and other Node contributors.
@ -989,8 +991,8 @@ return /******/ (function(modules) { // webpackBootstrap
'use strict';
var punycode = __webpack_require__(263);
var util = __webpack_require__(264);
var punycode = __webpack_require__(399);
var util = __webpack_require__(400);
exports.parse = urlParse;
exports.resolve = urlResolve;
@ -1065,7 +1067,7 @@ return /******/ (function(modules) { // webpackBootstrap
'gopher:': true,
'file:': true
},
querystring = __webpack_require__(265);
querystring = __webpack_require__(401);
function urlParse(url, parseQueryString, slashesDenoteHost) {
if (url && util.isObject(url) && url instanceof Url) return url;
@ -1702,7 +1704,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 263:
/***/ 399:
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {/*! https://mths.be/punycode v1.3.2 by @mathias */
@ -2238,7 +2240,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 264:
/***/ 400:
/***/ function(module, exports) {
'use strict';
@ -2261,18 +2263,18 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 265:
/***/ 401:
/***/ function(module, exports, __webpack_require__) {
'use strict';
exports.decode = exports.parse = __webpack_require__(266);
exports.encode = exports.stringify = __webpack_require__(267);
exports.decode = exports.parse = __webpack_require__(402);
exports.encode = exports.stringify = __webpack_require__(403);
/***/ },
/***/ 266:
/***/ 402:
/***/ function(module, exports) {
// Copyright Joyent, Inc. and other Node contributors.
@ -2359,7 +2361,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 267:
/***/ 403:
/***/ function(module, exports) {
// Copyright Joyent, Inc. and other Node contributors.
@ -2430,11 +2432,9 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 540:
/***/ 692:
/***/ function(module, exports, __webpack_require__) {
"use strict";
var _resolveAndFetch = (() => {
var _ref = _asyncToGenerator(function* (generatedSource) {
// Fetch the sourcemap over the network and create it.
@ -2566,23 +2566,23 @@ return /******/ (function(modules) { // webpackBootstrap
* @module utils/source-map-worker
*/
var networkRequest = __webpack_require__(127);
var networkRequest = __webpack_require__(125);
var _require = __webpack_require__(262),
var _require = __webpack_require__(398),
parse = _require.parse;
var path = __webpack_require__(208);
var path = __webpack_require__(296);
var _require2 = __webpack_require__(541),
var _require2 = __webpack_require__(693),
SourceMapConsumer = _require2.SourceMapConsumer,
SourceMapGenerator = _require2.SourceMapGenerator;
var _require3 = __webpack_require__(207),
var _require3 = __webpack_require__(295),
getContentType = _require3.getContentType;
var assert = __webpack_require__(197);
var assert = __webpack_require__(252);
var _require4 = __webpack_require__(220),
var _require4 = __webpack_require__(317),
originalToGeneratedId = _require4.originalToGeneratedId,
generatedToOriginalId = _require4.generatedToOriginalId,
isGeneratedId = _require4.isGeneratedId,
@ -2618,11 +2618,11 @@ return /******/ (function(modules) { // webpackBootstrap
_parse$host = _parse.host,
host = _parse$host === undefined ? "" : _parse$host;
return `${protocol}//${host}${sourceMapURL}`;
return `${ protocol }//${ host }${ sourceMapURL }`;
}
// Otherwise, it's a relative path and should be resolved relative
// to the source.
return `${path.dirname(url)}/${sourceMapURL}`;
return `${ path.dirname(url) }/${ sourceMapURL }`;
}
/**
@ -2710,7 +2710,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 541:
/***/ 693:
/***/ function(module, exports, __webpack_require__) {
/*
@ -2718,14 +2718,14 @@ return /******/ (function(modules) { // webpackBootstrap
* Licensed under the New BSD license. See LICENSE.txt or:
* http://opensource.org/licenses/BSD-3-Clause
*/
exports.SourceMapGenerator = __webpack_require__(542).SourceMapGenerator;
exports.SourceMapConsumer = __webpack_require__(548).SourceMapConsumer;
exports.SourceNode = __webpack_require__(551).SourceNode;
exports.SourceMapGenerator = __webpack_require__(694).SourceMapGenerator;
exports.SourceMapConsumer = __webpack_require__(700).SourceMapConsumer;
exports.SourceNode = __webpack_require__(703).SourceNode;
/***/ },
/***/ 542:
/***/ 694:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -2735,10 +2735,10 @@ return /******/ (function(modules) { // webpackBootstrap
* http://opensource.org/licenses/BSD-3-Clause
*/
var base64VLQ = __webpack_require__(543);
var util = __webpack_require__(545);
var ArraySet = __webpack_require__(546).ArraySet;
var MappingList = __webpack_require__(547).MappingList;
var base64VLQ = __webpack_require__(695);
var util = __webpack_require__(697);
var ArraySet = __webpack_require__(698).ArraySet;
var MappingList = __webpack_require__(699).MappingList;
/**
* An instance of the SourceMapGenerator represents a source map which is
@ -3136,7 +3136,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 543:
/***/ 695:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3176,7 +3176,7 @@ return /******/ (function(modules) { // webpackBootstrap
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
var base64 = __webpack_require__(544);
var base64 = __webpack_require__(696);
// A single base 64 digit can contain 6 bits of data. For the base 64 variable
// length quantities we use in the source map spec, the first bit is the sign,
@ -3283,7 +3283,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 544:
/***/ 696:
/***/ function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3357,7 +3357,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 545:
/***/ 697:
/***/ function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3781,7 +3781,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 546:
/***/ 698:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3791,7 +3791,7 @@ return /******/ (function(modules) { // webpackBootstrap
* http://opensource.org/licenses/BSD-3-Clause
*/
var util = __webpack_require__(545);
var util = __webpack_require__(697);
var has = Object.prototype.hasOwnProperty;
/**
@ -3892,7 +3892,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 547:
/***/ 699:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3902,7 +3902,7 @@ return /******/ (function(modules) { // webpackBootstrap
* http://opensource.org/licenses/BSD-3-Clause
*/
var util = __webpack_require__(545);
var util = __webpack_require__(697);
/**
* Determine whether mappingB is after mappingA with respect to generated
@ -3978,7 +3978,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 548:
/***/ 700:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -3988,11 +3988,11 @@ return /******/ (function(modules) { // webpackBootstrap
* http://opensource.org/licenses/BSD-3-Clause
*/
var util = __webpack_require__(545);
var binarySearch = __webpack_require__(549);
var ArraySet = __webpack_require__(546).ArraySet;
var base64VLQ = __webpack_require__(543);
var quickSort = __webpack_require__(550).quickSort;
var util = __webpack_require__(697);
var binarySearch = __webpack_require__(701);
var ArraySet = __webpack_require__(698).ArraySet;
var base64VLQ = __webpack_require__(695);
var quickSort = __webpack_require__(702).quickSort;
function SourceMapConsumer(aSourceMap) {
var sourceMap = aSourceMap;
@ -5067,7 +5067,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 549:
/***/ 701:
/***/ function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -5185,7 +5185,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 550:
/***/ 702:
/***/ function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -5306,7 +5306,7 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ },
/***/ 551:
/***/ 703:
/***/ function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@ -5316,8 +5316,8 @@ return /******/ (function(modules) { // webpackBootstrap
* http://opensource.org/licenses/BSD-3-Clause
*/
var SourceMapGenerator = __webpack_require__(542).SourceMapGenerator;
var util = __webpack_require__(545);
var SourceMapGenerator = __webpack_require__(694).SourceMapGenerator;
var util = __webpack_require__(697);
// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
// operating systems these days (capturing the result).
@ -5720,7 +5720,5 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ }
/******/ })
});
;
/******/ });
//# sourceMappingURL=source-map-worker.js.map

4
devtools/client/debugger/new/test/mochitest/browser.ini
View File

@ -11,7 +11,6 @@ support-files =
examples/sourcemaps2/main.min.js
examples/sourcemaps2/main.js
examples/sourcemaps2/main.js.map
examples/doc-asm.html
examples/doc-scripts.html
examples/doc-script-switching.html
examples/doc-exceptions.html
@ -23,7 +22,6 @@ support-files =
examples/doc-sourcemaps2.html
examples/doc-sourcemap-bogus.html
examples/doc-sources.html
examples/asm.js
examples/bogus-map.js
examples/entry.js
examples/exceptions.js
@ -39,10 +37,8 @@ support-files =
examples/script-switching-01.js
examples/times2.js
[browser_dbg-asm.js]
[browser_dbg-breaking.js]
[browser_dbg-breaking-from-console.js]
skip-if = true # Issue 1998
[browser_dbg-breakpoints.js]
[browser_dbg-breakpoints-cond.js]
[browser_dbg-call-stack.js]

33
devtools/client/debugger/new/test/mochitest/browser_dbg-asm.js
View File

@ -1,33 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests that asm.js AOT can be disabled and debugging of the asm.js code
// is working.
add_task(function* () {
const dbg = yield initDebugger("doc-asm.html");
const { selectors: { getSelectedSource }, getState } = dbg;
yield reload(dbg);
// After reload() we are getting getSources notifiction for old sources,
// using the debugger statement to really stop are reloaded page.
yield waitForPaused(dbg);
yield resume(dbg);
yield waitForSources(dbg, "doc-asm.html", "asm.js");
// Expand nodes and make sure more sources appear.
is(findAllElements(dbg, "sourceNodes").length, 2);
clickElement(dbg, "sourceArrow", 2);
is(findAllElements(dbg, "sourceNodes").length, 4);
selectSource(dbg, 'asm.js');
yield addBreakpoint(dbg, "asm.js", 7);
invokeInTab("runAsm");
yield waitForPaused(dbg);
assertPausedLocation(dbg, "asm.js", 7);
});

32
devtools/client/debugger/new/test/mochitest/browser_dbg-breaking.js
View File

@ -3,12 +3,30 @@
// Tests the breakpoints are hit in various situations.
const {
breaking,
setupTestRunner
} = require("devtools/client/debugger/new/integration-tests");
add_task(function* () {
const dbg = yield initDebugger("doc-scripts.html");
const { selectors: { getSelectedSource }, getState } = dbg;
add_task(function*() {
setupTestRunner(this);
yield breaking(this);
// Make sure we can set a top-level breakpoint and it will be hit on
// reload.
yield addBreakpoint(dbg, "scripts.html", 18);
reload(dbg);
yield waitForPaused(dbg);
assertPausedLocation(dbg, "scripts.html", 18);
yield resume(dbg);
const paused = waitForPaused(dbg);
// Create an eval script that pauses itself.
invokeInTab("doEval");
yield paused;
yield resume(dbg);
const source = getSelectedSource(getState()).toJS();
ok(!source.url, "It is an eval source");
yield addBreakpoint(dbg, source, 5);
invokeInTab("evaledFunc");
yield waitForPaused(dbg);
assertPausedLocation(dbg, source, 5);
});

52
devtools/client/debugger/new/test/mochitest/browser_dbg-breakpoints-cond.js
View File

@ -1,14 +1,50 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
// Tests basic pretty-printing functionality.
function findBreakpoint(dbg, url, line) {
const { selectors: { getBreakpoint }, getState } = dbg;
const source = findSource(dbg, url);
return getBreakpoint(getState(), { sourceId: source.id, line });
}
const {
breakpointsCond,
setupTestRunner
} = require("devtools/client/debugger/new/integration-tests");
function setConditionalBreakpoint(dbg, index, condition) {
return Task.spawn(function* () {
rightClickElement(dbg, "gutter", index);
selectMenuItem(dbg, 2);
yield waitForElement(dbg, ".conditional-breakpoint-panel input");
findElementWithSelector(dbg, ".conditional-breakpoint-panel input").focus();
type(dbg, condition);
pressKey(dbg, "Enter");
});
}
add_task(function*() {
setupTestRunner(this);
yield breakpointsCond(this);
add_task(function* () {
const dbg = yield initDebugger("doc-scripts.html");
yield selectSource(dbg, "simple2");
// Adding a conditional Breakpoint
yield setConditionalBreakpoint(dbg, 5, "1");
yield waitForDispatch(dbg, "ADD_BREAKPOINT");
let bp = findBreakpoint(dbg, "simple2", 5);
is(bp.condition, "1", "breakpoint is created with the condition");
// Editing a conditional Breakpoint
yield setConditionalBreakpoint(dbg, 5, "2");
yield waitForDispatch(dbg, "SET_BREAKPOINT_CONDITION");
bp = findBreakpoint(dbg, "simple2", 5);
is(bp.condition, "12", "breakpoint is created with the condition");
// Removing a conditional breakpoint
clickElement(dbg, "gutter", 5);
yield waitForDispatch(dbg, "REMOVE_BREAKPOINT");
bp = findBreakpoint(dbg, "simple2", 5);
is(bp, null, "breakpoint was removed");
// Adding a condition to a breakpoint
clickElement(dbg, "gutter", 5);
yield waitForDispatch(dbg, "ADD_BREAKPOINT");
yield setConditionalBreakpoint(dbg, 5, "1");
bp = findBreakpoint(dbg, "simple2", 5);
is(bp.condition, "1", "breakpoint is created with the condition");
});

9
devtools/client/debugger/new/test/mochitest/browser_dbg-console.js
View File

@ -27,19 +27,14 @@ function getSplitConsole(dbg) {
add_task(function* () {
Services.prefs.setBoolPref("devtools.toolbox.splitconsoleEnabled", true);
const dbg = yield initDebugger(
"doc-script-switching.html"
);
const dbg = yield initDebugger("doc-script-switching.html");
yield selectSource(dbg, "switching-01");
// open the console
const jsterm = yield getSplitConsole(dbg);
yield getSplitConsole(dbg);
ok(dbg.toolbox.splitConsole, "Split console is shown.");
info("Evaluating a script in the console");
yield jsterm.execute("1+1");
// close the console
clickElement(dbg, "codeMirror");
// First time to focus out of text area

31
devtools/client/debugger/new/test/mochitest/browser_dbg-pretty-print.js
View File

@ -3,12 +3,29 @@
// Tests basic pretty-printing functionality.
const {
prettyPrint,
setupTestRunner
} = require("devtools/client/debugger/new/integration-tests");
add_task(function* () {
const dbg = yield initDebugger("doc-minified.html");
add_task(function*() {
setupTestRunner(this);
yield prettyPrint(this);
yield selectSource(dbg, "math.min.js");
clickElement(dbg, "prettyPrintButton");
yield waitForDispatch(dbg, "TOGGLE_PRETTY_PRINT");
const ppSrc = findSource(dbg, "math.min.js:formatted");
ok(ppSrc, "Pretty-printed source exists");
yield addBreakpoint(dbg, ppSrc, 18);
invokeInTab("arithmetic");
yield waitForPaused(dbg);
assertPausedLocation(dbg, ppSrc, 18);
yield stepOver(dbg);
assertPausedLocation(dbg, ppSrc, 27);
yield resume(dbg);
// The pretty-print button should go away in the pretty-printed
// source.
ok(!findElement(dbg, "sourceFooter"), "Footer is hidden");
yield selectSource(dbg, "math.min.js");
ok(findElement(dbg, "sourceFooter"), "Footer is hidden");
});

11
devtools/client/debugger/new/test/mochitest/examples/asm.js
View File

@ -1,11 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
var asmjs = (function () {
"use asm";
function f() {
return 1|0;
}
return {f: f};
})()

20
devtools/client/debugger/new/test/mochitest/examples/doc-asm.html
View File

@ -1,20 +0,0 @@
<!-- Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8"/>
<title>Asm.js</title>
<script src="asm.js"></script>
<script>
function runAsm() {
console.log(asmjs.f());
}
debugger; // see browser_dbg-asm.js reload() comment
</script>
</head>
<body>
<button onclick="runAsm()">test</button>
</body>
</html>

12
devtools/client/debugger/new/test/mochitest/head.js
View File

@ -41,11 +41,6 @@ Services.prefs.setBoolPref("devtools.debugger.new-debugger-frontend", true);
Services.prefs.clearUserPref("devtools.debugger.tabs")
Services.prefs.clearUserPref("devtools.debugger.pending-selected-location")
this.gBrowser = gBrowser;
this.Services = Services;
this.EXAMPLE_URL = EXAMPLE_URL;
this.EventUtils = EventUtils;
registerCleanupFunction(() => {
Services.prefs.clearUserPref("devtools.debugger.new-debugger-frontend");
delete window.resumeTest;
@ -293,7 +288,6 @@ function createDebuggerContext(toolbox) {
getState: store.getState,
store: store,
client: win.Debugger.client,
threadClient: toolbox.threadClient,
toolbox: toolbox,
win: win
};
@ -312,8 +306,7 @@ function initDebugger(url, ...sources) {
return Task.spawn(function* () {
Services.prefs.clearUserPref("devtools.debugger.tabs")
Services.prefs.clearUserPref("devtools.debugger.pending-selected-location")
url = url.startsWith("data:") ? url : EXAMPLE_URL + url;
const toolbox = yield openNewTabAndToolbox(url, "jsdebugger");
const toolbox = yield openNewTabAndToolbox(EXAMPLE_URL + url, "jsdebugger");
return createDebuggerContext(toolbox);
});
}
@ -446,7 +439,7 @@ function resume(dbg) {
* @static
*/
function reload(dbg, ...sources) {
return dbg.client.reload().then(() => waitForSources(dbg, ...sources));
return dbg.client.reload().then(() => waitForSources(...sources));
}
/**
@ -531,7 +524,6 @@ function togglePauseOnExceptions(dbg,
* @return {Promise}
* @static
*/
function invokeInTab(fnc) {
info(`Invoking function ${fnc} in tab`);
return ContentTask.spawn(gBrowser.selectedBrowser, fnc, function* (fnc) {

58
devtools/client/locales/en-US/debugger.properties
View File

@ -14,14 +14,6 @@
# that collapses the left and right panes in the debugger UI.
collapsePanes=Collapse panes
# LOCALIZATION NOTE (copySourceUrl): This is the text that appears in the
# context menu to copy the source URL of file open.
copySourceUrl=Copy Source Url
# LOCALIZATION NOTE (copySourceUrl.key): Access key to copy the source URL of a file from
# the context menu.
copySourceUrl.key=X
# LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
# that expands the left and right panes in the debugger UI.
expandPanes=Expand panes
@ -124,10 +116,6 @@ blackBoxCheckboxTooltip=Toggle black boxing
# searching all the source files the debugger has seen.
sources.search.key=P
# LOCALIZATION NOTE (sources.searchAlt.key): Alternate key shortcut to open
# the search for searching all the source files the debugger has seen.
sources.searchAlt.key=O
# LOCALIZATION NOTE (sourceSearch.search.key): Key shortcut to open the search
# for searching within a the currently opened files in the editor
sourceSearch.search.key=F
@ -281,58 +269,18 @@ expressions.placeholder=Add Watch Expression
# for closing the selected tab below the mouse.
sourceTabs.closeTab=Close tab
# LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item
# for closing the selected tab below the mouse.
sourceTabs.closeTab.key=C
# LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item
# for closing the other tabs.
sourceTabs.closeOtherTabs=Close others
# LOCALIZATION NOTE (sourceTabs.closeOtherTabs.key): Access key to close other source tabs
# from the editor context menu.
sourceTabs.closeOtherTabs.key=O
# LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item
# for closing the tabs to the end (the right for LTR languages) of the selected tab.
sourceTabs.closeTabsToEnd=Close tabs to the right
# LOCALIZATION NOTE (sourceTabs.closeTabsToEnd.key): Access key to close source tabs
# after the selected tab from the editor context menu.
sourceTabs.closeTabsToEnd.key=R
# LOCALIZATION NOTE (sourceTabs.closeTabsToRight): Editor source tab context menu item
# for closing the tabs to the right of the selected tab.
sourceTabs.closeTabsToRight=Close tabs to the right
# LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item
# for closing all tabs.
sourceTabs.closeAllTabs=Close all tabs
# LOCALIZATION NOTE (sourceTabs.closeAllTabs.key): Access key to close all tabs from the
# editor context menu.
sourceTabs.closeAllTabs.key=A
# LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item
# for revealing source in tree.
sourceTabs.revealInTree=Reveal in Tree
# LOCALIZATION NOTE (sourceTabs.revealInTree.key): Access key to reveal a source in the
# tree from the context menu.
sourceTabs.revealInTree.key=s
# LOCALIZATION NOTE (sourceTabs.copyLink): Editor source tab context menu item
# for copying a link address.
sourceTabs.copyLink=Copy Link Address
# LOCALIZATION NOTE (sourceTabs.copyLink.key): Access key to copy a link addresss from the
# editor context menu.
sourceTabs.copyLink.key=X
# LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item
# for pretty printing the source.
sourceTabs.prettyPrint=Pretty Print Source
# LOCALIZATION NOTE (sourceTabs.prettyPrint.key): Access key to pretty print a source from
# the editor context menu.
sourceTabs.prettyPrint.key=Z
# LOCALIZATION NOTE (sourceTabs.closeTabButtonTooltip): The tooltip that is displayed
# for close tab button in source tabs.
sourceTabs.closeTabButtonTooltip=Close tab