зеркало из https://github.com/mozilla/gecko-dev.git
Merge fx-team to central, a=merge
This commit is contained in:
Коммит
8eb4fd2c7b
|
@ -704,8 +704,6 @@
|
|||
aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
|
||||
<image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
|
||||
aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
|
||||
<image data-permission-id="pointerLock" class="blocked-permission-icon pointerLock-icon" role="button"
|
||||
aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
|
||||
</box>
|
||||
<box id="notification-popup-box"
|
||||
hidden="true"
|
||||
|
@ -735,8 +733,6 @@
|
|||
aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
|
||||
<image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
|
||||
aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
|
||||
<image id="pointerLock-notification-icon" class="notification-anchor-icon pointerLock-icon" role="button"
|
||||
aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
|
||||
<image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
|
||||
aria-label="&urlbar.servicesNotificationAnchor.label;"/>
|
||||
<image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
|
||||
|
|
|
@ -44,12 +44,6 @@
|
|||
</popupnotificationcontent>
|
||||
</popupnotification>
|
||||
|
||||
<popupnotification id="pointerLock-notification" hidden="true">
|
||||
<popupnotificationcontent orient="vertical" align="start">
|
||||
<label id="pointerLock-cancel">&pointerLock.notification.message;</label>
|
||||
</popupnotificationcontent>
|
||||
</popupnotification>
|
||||
|
||||
<popupnotification id="password-notification" hidden="true">
|
||||
<popupnotificationcontent orient="vertical">
|
||||
<textbox id="password-notification-username"/>
|
||||
|
|
|
@ -222,7 +222,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
|
|||
<!ENTITY urlbar.webRTCShareMicrophoneNotificationAnchor.label "Manage sharing your microphone with the site">
|
||||
<!ENTITY urlbar.webRTCShareScreenNotificationAnchor.label "Manage sharing your windows or screen with the site">
|
||||
|
||||
<!ENTITY urlbar.pointerLockNotificationAnchor.label "Change whether the site can hide the pointer">
|
||||
<!ENTITY urlbar.servicesNotificationAnchor.label "View the service install message">
|
||||
<!ENTITY urlbar.translateNotificationAnchor.label "Translate this page">
|
||||
<!ENTITY urlbar.translatedNotificationAnchor.label "Manage page translation">
|
||||
|
@ -830,8 +829,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
|
|||
<!ENTITY trackingContentBlocked.block.accesskey "E">
|
||||
<!ENTITY trackingContentBlocked.disabled.message "Tracking protection is disabled">
|
||||
|
||||
<!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
|
||||
|
||||
<!ENTITY pluginNotification.showAll.label "Show All">
|
||||
<!ENTITY pluginNotification.showAll.accesskey "S">
|
||||
|
||||
|
|
|
@ -52,14 +52,12 @@
|
|||
.login-icon,
|
||||
.microphone-icon,
|
||||
.plugin-icon,
|
||||
.pointerLock-icon,
|
||||
.popup-icon,
|
||||
.screen-icon,
|
||||
.desktop-notification-icon,
|
||||
.popup-notification-icon[popupid="geolocation"],
|
||||
.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
|
||||
.popup-notification-icon[popupid="password"],
|
||||
.popup-notification-icon[popupid="pointerLock"],
|
||||
.popup-notification-icon[popupid="webRTC-shareDevices"],
|
||||
.popup-notification-icon[popupid="webRTC-shareMicrophone"],
|
||||
.popup-notification-icon[popupid="webRTC-shareScreen"],
|
||||
|
@ -166,15 +164,6 @@
|
|||
list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked);
|
||||
}
|
||||
|
||||
.popup-notification-icon[popupid="pointerLock"],
|
||||
.pointerLock-icon {
|
||||
list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock);
|
||||
}
|
||||
|
||||
.pointerLock-icon.blocked-permission-icon {
|
||||
list-style-image: url(chrome://browser/skin/notification-icons.svg#pointerLock-blocked);
|
||||
}
|
||||
|
||||
/* This icon has a block sign in it, so we don't need a blocked version. */
|
||||
.popup-icon {
|
||||
list-style-image: url("chrome://browser/skin/notification-icons.svg#popup");
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
<path id="microphone-icon" d="m 8,14 0,4 a 8,8 0 0 0 6,7.7 l 0,2.3 -2,0 a 2,2 0 0 0 -2,2 l 12,0 a 2,2 0 0 0 -2,-2 l -2,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 -2,0 0,4 a 6,6 0 0 1 -12,0 l 0,-4 z m 4,4 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
|
||||
<path id="microphone-detailed-icon" d="m 8,18 a 8,8 0 0 0 6,7.7 l 0,2.3 -1,0 a 3,2 0 0 0 -3,2 l 12,0 a 3,2 0 0 0 -3,-2 l -1,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 a 1,1 0 0 0 -2,0 l 0,4 a 6,6 0 0 1 -12,0 l 0,-4 a 1,1 0 0 0 -2,0 z m 4,0 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
|
||||
<path id="plugin-icon" d="m 2,26 a 2,2 0 0 0 2,2 l 24,0 a 2,2 0 0 0 2,-2 l 0,-16 a 2,2 0 0 0 -2,-2 l -24,0 a 2,2 0 0 0 -2,2 z m 2,-20 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z m 14,0 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z" />
|
||||
<path id="pointerLock-icon" d="m 8,24 6,-5 5,10 4,-2 -5,-10 7,-1 -17,-14 z" />
|
||||
<path id="popup-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 8,0 a 10,10 0 0 1 -2,-4 l -4,0 a 2,2 0 0 1 -2,-2 l 0,-12 18,0 0,2 a 10,10 0 0 1 4,2 l 0,-8 a 4,4 0 0 0 -4,-4 l -18,0 a 4,4 0 0 0 -4,4 z m 12,-2.1 a 8,8 0 1 1 0,0.2 m 10.7,-4.3 a 5,5 0 0 0 -6.9,6.9 z m -5.4,8.4 a 5,5 0 0 0 6.9,-6.9 z" />
|
||||
<path id="screen-icon" d="m 2,18 a 2,2 0 0 0 2,2 l 2,0 0,-6 a 4,4 0 0 1 4,-4 l 14,0 0,-6 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z m 6,10 a 2,2 0 0 0 2,2 l 18,0 a 2,2 0 0 0 2,-2 l 0,-14 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z" />
|
||||
|
||||
|
@ -64,8 +63,6 @@
|
|||
<use id="microphone-detailed" xlink:href="#microphone-detailed-icon" />
|
||||
<use id="plugin" xlink:href="#plugin-icon" />
|
||||
<use id="plugin-blocked" class="blocked" xlink:href="#plugin-icon" />
|
||||
<use id="pointerLock" xlink:href="#pointerLock-icon" />
|
||||
<use id="pointerLock-blocked" class="blocked" xlink:href="#pointerLock-icon" />
|
||||
<use id="popup" xlink:href="#popup-icon" />
|
||||
<use id="screen" xlink:href="#screen-icon" />
|
||||
<use id="screen-blocked" class="blocked" xlink:href="#screen-icon" />
|
||||
|
|
До Ширина: | Высота: | Размер: 6.1 KiB После Ширина: | Высота: | Размер: 5.8 KiB |
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -30,7 +30,10 @@ module.exports = function(name, props) { // eslint-disable-line
|
|||
if (!svg[name]) {
|
||||
throw new Error("Unknown SVG: " + name);
|
||||
}
|
||||
let className = props ? `${name} ${props.className}` : name;
|
||||
let className = name;
|
||||
if (props && props.className) {
|
||||
className = `${name} ${props.className}`;
|
||||
}
|
||||
if (name === "subSettings") {
|
||||
className = "";
|
||||
}
|
||||
|
|
|
@ -18,15 +18,52 @@ DebuggerPanel.prototype = {
|
|||
}
|
||||
|
||||
return targetPromise.then(() => {
|
||||
const dbg = this.panelWin.Debugger;
|
||||
dbg.setThreadClient(this.toolbox.threadClient);
|
||||
dbg.setTabTarget(this.toolbox.target);
|
||||
dbg.initPage(dbg.getActions());
|
||||
dbg.renderApp();
|
||||
this.panelWin.Debugger.bootstrap({
|
||||
threadClient: this.toolbox.threadClient,
|
||||
tabTarget: this.toolbox.target
|
||||
});
|
||||
return this;
|
||||
});
|
||||
},
|
||||
|
||||
_store: function() {
|
||||
return this.panelWin.Debugger.store;
|
||||
},
|
||||
|
||||
_getState: function() {
|
||||
return this._store().getState();
|
||||
},
|
||||
|
||||
_actions: function() {
|
||||
return this.panelWin.Debugger.actions;
|
||||
},
|
||||
|
||||
_selectors: function() {
|
||||
return this.panelWin.Debugger.selectors;
|
||||
},
|
||||
|
||||
getFrames: function() {
|
||||
let frames = this._selectors().getFrames(this._getState());
|
||||
|
||||
// frames is an empty array when the debugger is not paused
|
||||
if (!frames.toJS) {
|
||||
return {
|
||||
frames: [],
|
||||
selected: -1
|
||||
}
|
||||
}
|
||||
|
||||
frames = frames.toJS();
|
||||
const selectedFrame = this._selectors().getSelectedFrame(this._getState());
|
||||
const selected = frames.findIndex(frame => frame.id == selectedFrame.id);
|
||||
|
||||
frames.forEach(frame => {
|
||||
frame.actor = frame.id;
|
||||
});
|
||||
|
||||
return { frames, selected };
|
||||
},
|
||||
|
||||
destroy: function() {
|
||||
}
|
||||
};
|
||||
|
|
|
@ -46,7 +46,7 @@ var Debugger =
|
|||
/***/ 0:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var prettyFast = __webpack_require__(515);
|
||||
var prettyFast = __webpack_require__(544);
|
||||
|
||||
self.onmessage = function (msg) {
|
||||
var _prettyPrint = prettyPrint(msg.data);
|
||||
|
@ -100,7 +100,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 515:
|
||||
/***/ 544:
|
||||
/***/ 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 -*- */
|
||||
|
@ -122,8 +122,8 @@ var Debugger =
|
|||
}(this, function () {
|
||||
"use strict";
|
||||
|
||||
var acorn = this.acorn || __webpack_require__(516);
|
||||
var sourceMap = this.sourceMap || __webpack_require__(517);
|
||||
var acorn = this.acorn || __webpack_require__(545);
|
||||
var sourceMap = this.sourceMap || __webpack_require__(546);
|
||||
var SourceNode = sourceMap.SourceNode;
|
||||
|
||||
// If any of these tokens are seen before a "[" token, we know that "[" token
|
||||
|
@ -982,7 +982,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 516:
|
||||
/***/ 545:
|
||||
/***/ 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.
|
||||
|
@ -3642,7 +3642,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 517:
|
||||
/***/ 546:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
/*
|
||||
|
@ -3650,14 +3650,14 @@ var Debugger =
|
|||
* Licensed under the New BSD license. See LICENSE.txt or:
|
||||
* http://opensource.org/licenses/BSD-3-Clause
|
||||
*/
|
||||
exports.SourceMapGenerator = __webpack_require__(518).SourceMapGenerator;
|
||||
exports.SourceMapConsumer = __webpack_require__(524).SourceMapConsumer;
|
||||
exports.SourceNode = __webpack_require__(526).SourceNode;
|
||||
exports.SourceMapGenerator = __webpack_require__(547).SourceMapGenerator;
|
||||
exports.SourceMapConsumer = __webpack_require__(553).SourceMapConsumer;
|
||||
exports.SourceNode = __webpack_require__(555).SourceNode;
|
||||
|
||||
|
||||
/***/ },
|
||||
|
||||
/***/ 518:
|
||||
/***/ 547:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -3671,10 +3671,10 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var base64VLQ = __webpack_require__(519);
|
||||
var util = __webpack_require__(521);
|
||||
var ArraySet = __webpack_require__(522).ArraySet;
|
||||
var MappingList = __webpack_require__(523).MappingList;
|
||||
var base64VLQ = __webpack_require__(548);
|
||||
var util = __webpack_require__(550);
|
||||
var ArraySet = __webpack_require__(551).ArraySet;
|
||||
var MappingList = __webpack_require__(552).MappingList;
|
||||
|
||||
/**
|
||||
* An instance of the SourceMapGenerator represents a source map which is
|
||||
|
@ -4064,7 +4064,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 519:
|
||||
/***/ 548:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4108,7 +4108,7 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var base64 = __webpack_require__(520);
|
||||
var base64 = __webpack_require__(549);
|
||||
|
||||
// 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,
|
||||
|
@ -4213,7 +4213,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 520:
|
||||
/***/ 549:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4262,7 +4262,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 521:
|
||||
/***/ 550:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4588,7 +4588,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 522:
|
||||
/***/ 551:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4602,7 +4602,7 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var util = __webpack_require__(521);
|
||||
var util = __webpack_require__(550);
|
||||
|
||||
/**
|
||||
* A data structure which is a combination of an array and a set. Adding a new
|
||||
|
@ -4692,7 +4692,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 523:
|
||||
/***/ 552:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4706,7 +4706,7 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var util = __webpack_require__(521);
|
||||
var util = __webpack_require__(550);
|
||||
|
||||
/**
|
||||
* Determine whether mappingB is after mappingA with respect to generated
|
||||
|
@ -4785,7 +4785,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 524:
|
||||
/***/ 553:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -4799,10 +4799,10 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var util = __webpack_require__(521);
|
||||
var binarySearch = __webpack_require__(525);
|
||||
var ArraySet = __webpack_require__(522).ArraySet;
|
||||
var base64VLQ = __webpack_require__(519);
|
||||
var util = __webpack_require__(550);
|
||||
var binarySearch = __webpack_require__(554);
|
||||
var ArraySet = __webpack_require__(551).ArraySet;
|
||||
var base64VLQ = __webpack_require__(548);
|
||||
|
||||
/**
|
||||
* A SourceMapConsumer instance represents a parsed source map which we can
|
||||
|
@ -5367,7 +5367,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 525:
|
||||
/***/ 554:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -5454,7 +5454,7 @@ var Debugger =
|
|||
|
||||
/***/ },
|
||||
|
||||
/***/ 526:
|
||||
/***/ 555:
|
||||
/***/ function(module, exports, __webpack_require__) {
|
||||
|
||||
var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- Mode: js; js-indent-level: 2; -*- */
|
||||
|
@ -5468,8 +5468,8 @@ var Debugger =
|
|||
}
|
||||
!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
|
||||
|
||||
var SourceMapGenerator = __webpack_require__(518).SourceMapGenerator;
|
||||
var util = __webpack_require__(521);
|
||||
var SourceMapGenerator = __webpack_require__(547).SourceMapGenerator;
|
||||
var util = __webpack_require__(550);
|
||||
|
||||
// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
|
||||
// operating systems these days (capturing the result).
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -93,6 +93,19 @@ DebuggerPanel.prototype = {
|
|||
|
||||
// DebuggerPanel API
|
||||
|
||||
getFrames() {
|
||||
let framesController = this.panelWin.DebuggerController.StackFrames;
|
||||
let thread = framesController.activeThread;
|
||||
if (thread && thread.paused) {
|
||||
return {
|
||||
frames: thread.cachedFrames,
|
||||
selected: framesController.currentFrameDepth,
|
||||
};
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
|
||||
addBreakpoint: function (location) {
|
||||
const { actions } = this.panelWin;
|
||||
const { dispatch } = this._controller;
|
||||
|
|
|
@ -521,18 +521,12 @@ WebConsole.prototype = {
|
|||
return null;
|
||||
}
|
||||
let panel = toolbox.getPanel("jsdebugger");
|
||||
|
||||
if (!panel) {
|
||||
return null;
|
||||
}
|
||||
let framesController = panel.panelWin.DebuggerController.StackFrames;
|
||||
let thread = framesController.activeThread;
|
||||
if (thread && thread.paused) {
|
||||
return {
|
||||
frames: thread.cachedFrames,
|
||||
selected: framesController.currentFrameDepth,
|
||||
};
|
||||
}
|
||||
return null;
|
||||
|
||||
return panel.getFrames();
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче