| Index: third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
|
| index 247afc0a5e9c23fab46d880f6bc8f66f2d1f14f9..299193f38517295a0a73d47afb8e1fc2cffc23a2 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sources/JavaScriptSourceFrame.js
|
| @@ -27,1052 +27,1043 @@
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
| -
|
| /**
|
| - * @constructor
|
| - * @extends {WebInspector.UISourceCodeFrame}
|
| - * @param {!WebInspector.UISourceCode} uiSourceCode
|
| + * @unrestricted
|
| */
|
| -WebInspector.JavaScriptSourceFrame = function(uiSourceCode)
|
| -{
|
| - WebInspector.UISourceCodeFrame.call(this, uiSourceCode);
|
| +WebInspector.JavaScriptSourceFrame = class extends WebInspector.UISourceCodeFrame {
|
| + /**
|
| + * @param {!WebInspector.UISourceCode} uiSourceCode
|
| + */
|
| + constructor(uiSourceCode) {
|
| + super(uiSourceCode);
|
|
|
| this._scriptsPanel = WebInspector.SourcesPanel.instance();
|
| this._breakpointManager = WebInspector.breakpointManager;
|
| if (uiSourceCode.project().type() === WebInspector.projectTypes.Debugger)
|
| - this.element.classList.add("source-frame-debugger-script");
|
| + this.element.classList.add('source-frame-debugger-script');
|
|
|
| - this._popoverHelper = new WebInspector.ObjectPopoverHelper(this._scriptsPanel.element,
|
| - this._getPopoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), this._onHidePopover.bind(this), true);
|
| + this._popoverHelper = new WebInspector.ObjectPopoverHelper(
|
| + this._scriptsPanel.element, this._getPopoverAnchor.bind(this), this._resolveObjectForPopover.bind(this),
|
| + this._onHidePopover.bind(this), true);
|
| this._popoverHelper.setTimeout(250, 250);
|
|
|
| - this.textEditor.element.addEventListener("keydown", this._onKeyDown.bind(this), true);
|
| + this.textEditor.element.addEventListener('keydown', this._onKeyDown.bind(this), true);
|
|
|
| - this.textEditor.addEventListener(WebInspector.SourcesTextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
|
| + this.textEditor.addEventListener(
|
| + WebInspector.SourcesTextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
|
|
|
| - this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
|
| - this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
|
| + this._breakpointManager.addEventListener(
|
| + WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
|
| + this._breakpointManager.addEventListener(
|
| + WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
|
|
|
| - this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
|
| - this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
|
| - this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
|
| - this.uiSourceCode().addEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
|
| + this.uiSourceCode().addEventListener(
|
| + WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
|
| + this.uiSourceCode().addEventListener(
|
| + WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
|
| + this.uiSourceCode().addEventListener(
|
| + WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
|
| + this.uiSourceCode().addEventListener(
|
| + WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
|
|
|
| /** @type {!Map.<!WebInspector.Target, !WebInspector.ResourceScriptFile>}*/
|
| this._scriptFileForTarget = new Map();
|
| var targets = WebInspector.targetManager.targets();
|
| for (var i = 0; i < targets.length; ++i) {
|
| - var scriptFile = WebInspector.debuggerWorkspaceBinding.scriptFile(uiSourceCode, targets[i]);
|
| - if (scriptFile)
|
| - this._updateScriptFile(targets[i]);
|
| + var scriptFile = WebInspector.debuggerWorkspaceBinding.scriptFile(uiSourceCode, targets[i]);
|
| + if (scriptFile)
|
| + this._updateScriptFile(targets[i]);
|
| }
|
|
|
| - if (this._scriptFileForTarget.size || uiSourceCode.extension() === "js" || uiSourceCode.project().type() === WebInspector.projectTypes.Snippets)
|
| - this._compiler = new WebInspector.JavaScriptCompiler(this);
|
| + if (this._scriptFileForTarget.size || uiSourceCode.extension() === 'js' ||
|
| + uiSourceCode.project().type() === WebInspector.projectTypes.Snippets)
|
| + this._compiler = new WebInspector.JavaScriptCompiler(this);
|
|
|
| - WebInspector.moduleSetting("skipStackFramesPattern").addChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| - WebInspector.moduleSetting("skipContentScripts").addChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| + WebInspector.moduleSetting('skipStackFramesPattern').addChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| + WebInspector.moduleSetting('skipContentScripts').addChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| this._showBlackboxInfobarIfNeeded();
|
| /** @type {!Map.<number, !Element>} */
|
| this._valueWidgets = new Map();
|
| -};
|
| -
|
| -WebInspector.JavaScriptSourceFrame.prototype = {
|
| - /**
|
| - * @override
|
| - * @return {!Array<!WebInspector.ToolbarItem>}
|
| - */
|
| - syncToolbarItems: function()
|
| - {
|
| - var result = WebInspector.UISourceCodeFrame.prototype.syncToolbarItems.call(this);
|
| - var originURL = WebInspector.CompilerScriptMapping.uiSourceCodeOrigin(this.uiSourceCode());
|
| - if (originURL) {
|
| - var parsedURL = originURL.asParsedURL();
|
| - if (parsedURL)
|
| - result.push(new WebInspector.ToolbarText(WebInspector.UIString("(source mapped from %s)", parsedURL.displayName)));
|
| - }
|
| - return result;
|
| - },
|
| -
|
| - _updateInfobars: function()
|
| - {
|
| - this.attachInfobars([this._blackboxInfobar, this._divergedInfobar]);
|
| - },
|
| -
|
| - _showDivergedInfobar: function()
|
| - {
|
| - if (!this.uiSourceCode().contentType().isScript())
|
| - return;
|
| -
|
| - if (this._divergedInfobar)
|
| - this._divergedInfobar.dispose();
|
| -
|
| - var infobar = new WebInspector.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("Workspace mapping mismatch"));
|
| - this._divergedInfobar = infobar;
|
| -
|
| - var fileURL = this.uiSourceCode().url();
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("The content of this file on the file system:\u00a0")).appendChild(
|
| - WebInspector.linkifyURLAsNode(fileURL, fileURL, "source-frame-infobar-details-url", true));
|
| -
|
| - var scriptURL = this.uiSourceCode().url();
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("does not match the loaded script:\u00a0")).appendChild(
|
| - WebInspector.linkifyURLAsNode(scriptURL, scriptURL, "source-frame-infobar-details-url", true));
|
| -
|
| - infobar.createDetailsRowMessage();
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("Possible solutions are:"));
|
| -
|
| - if (WebInspector.moduleSetting("cacheDisabled").get())
|
| - infobar.createDetailsRowMessage(" - ").createTextChild(WebInspector.UIString("Reload inspected page"));
|
| - else
|
| - infobar.createDetailsRowMessage(" - ").createTextChild(WebInspector.UIString("Check \"Disable cache\" in settings and reload inspected page (recommended setup for authoring and debugging)"));
|
| - infobar.createDetailsRowMessage(" - ").createTextChild(WebInspector.UIString("Check that your file and script are both loaded from the correct source and their contents match"));
|
| -
|
| - this._updateInfobars();
|
| - },
|
| -
|
| - _hideDivergedInfobar: function()
|
| - {
|
| - if (!this._divergedInfobar)
|
| - return;
|
| - this._divergedInfobar.dispose();
|
| - delete this._divergedInfobar;
|
| - },
|
| -
|
| - _showBlackboxInfobarIfNeeded: function()
|
| - {
|
| - var uiSourceCode = this.uiSourceCode();
|
| - if (!uiSourceCode.contentType().hasScripts())
|
| - return;
|
| - var projectType = uiSourceCode.project().type();
|
| - if (projectType === WebInspector.projectTypes.Snippets)
|
| - return;
|
| - if (!WebInspector.blackboxManager.isBlackboxedUISourceCode(uiSourceCode)) {
|
| - this._hideBlackboxInfobar();
|
| - return;
|
| - }
|
| -
|
| - if (this._blackboxInfobar)
|
| - this._blackboxInfobar.dispose();
|
| -
|
| - var infobar = new WebInspector.Infobar(WebInspector.Infobar.Type.Warning, WebInspector.UIString("This script is blackboxed in debugger"));
|
| - this._blackboxInfobar = infobar;
|
| -
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("Debugger will skip stepping through this script, and will not stop on exceptions"));
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @return {!Array<!WebInspector.ToolbarItem>}
|
| + */
|
| + syncToolbarItems() {
|
| + var result = super.syncToolbarItems();
|
| + var originURL = WebInspector.CompilerScriptMapping.uiSourceCodeOrigin(this.uiSourceCode());
|
| + if (originURL) {
|
| + var parsedURL = originURL.asParsedURL();
|
| + if (parsedURL)
|
| + result.push(
|
| + new WebInspector.ToolbarText(WebInspector.UIString('(source mapped from %s)', parsedURL.displayName)));
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + _updateInfobars() {
|
| + this.attachInfobars([this._blackboxInfobar, this._divergedInfobar]);
|
| + }
|
| +
|
| + _showDivergedInfobar() {
|
| + if (!this.uiSourceCode().contentType().isScript())
|
| + return;
|
| +
|
| + if (this._divergedInfobar)
|
| + this._divergedInfobar.dispose();
|
| +
|
| + var infobar = new WebInspector.Infobar(
|
| + WebInspector.Infobar.Type.Warning, WebInspector.UIString('Workspace mapping mismatch'));
|
| + this._divergedInfobar = infobar;
|
| +
|
| + var fileURL = this.uiSourceCode().url();
|
| + infobar.createDetailsRowMessage(WebInspector.UIString('The content of this file on the file system:\u00a0'))
|
| + .appendChild(WebInspector.linkifyURLAsNode(fileURL, fileURL, 'source-frame-infobar-details-url', true));
|
| +
|
| + var scriptURL = this.uiSourceCode().url();
|
| + infobar.createDetailsRowMessage(WebInspector.UIString('does not match the loaded script:\u00a0'))
|
| + .appendChild(WebInspector.linkifyURLAsNode(scriptURL, scriptURL, 'source-frame-infobar-details-url', true));
|
| +
|
| + infobar.createDetailsRowMessage();
|
| + infobar.createDetailsRowMessage(WebInspector.UIString('Possible solutions are:'));
|
| +
|
| + if (WebInspector.moduleSetting('cacheDisabled').get())
|
| + infobar.createDetailsRowMessage(' - ').createTextChild(WebInspector.UIString('Reload inspected page'));
|
| + else
|
| + infobar.createDetailsRowMessage(' - ').createTextChild(WebInspector.UIString(
|
| + 'Check "Disable cache" in settings and reload inspected page (recommended setup for authoring and debugging)'));
|
| + infobar.createDetailsRowMessage(' - ').createTextChild(WebInspector.UIString(
|
| + 'Check that your file and script are both loaded from the correct source and their contents match'));
|
| +
|
| + this._updateInfobars();
|
| + }
|
| +
|
| + _hideDivergedInfobar() {
|
| + if (!this._divergedInfobar)
|
| + return;
|
| + this._divergedInfobar.dispose();
|
| + delete this._divergedInfobar;
|
| + }
|
| +
|
| + _showBlackboxInfobarIfNeeded() {
|
| + var uiSourceCode = this.uiSourceCode();
|
| + if (!uiSourceCode.contentType().hasScripts())
|
| + return;
|
| + var projectType = uiSourceCode.project().type();
|
| + if (projectType === WebInspector.projectTypes.Snippets)
|
| + return;
|
| + if (!WebInspector.blackboxManager.isBlackboxedUISourceCode(uiSourceCode)) {
|
| + this._hideBlackboxInfobar();
|
| + return;
|
| + }
|
|
|
| - var scriptFile = this._scriptFileForTarget.size ? this._scriptFileForTarget.valuesArray()[0] : null;
|
| - if (scriptFile && scriptFile.hasSourceMapURL())
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("Source map found, but ignored for blackboxed file."));
|
| - infobar.createDetailsRowMessage();
|
| - infobar.createDetailsRowMessage(WebInspector.UIString("Possible ways to cancel this behavior are:"));
|
| + if (this._blackboxInfobar)
|
| + this._blackboxInfobar.dispose();
|
|
|
| - infobar.createDetailsRowMessage(" - ").createTextChild(WebInspector.UIString("Go to \"%s\" tab in settings", WebInspector.UIString("Blackboxing")));
|
| - var unblackboxLink = infobar.createDetailsRowMessage(" - ").createChild("span", "link");
|
| - unblackboxLink.textContent = WebInspector.UIString("Unblackbox this script");
|
| - unblackboxLink.addEventListener("click", unblackbox, false);
|
| + var infobar = new WebInspector.Infobar(
|
| + WebInspector.Infobar.Type.Warning, WebInspector.UIString('This script is blackboxed in debugger'));
|
| + this._blackboxInfobar = infobar;
|
|
|
| - function unblackbox()
|
| - {
|
| - WebInspector.blackboxManager.unblackboxUISourceCode(uiSourceCode);
|
| - if (projectType === WebInspector.projectTypes.ContentScripts)
|
| - WebInspector.blackboxManager.unblackboxContentScripts();
|
| - }
|
| + infobar.createDetailsRowMessage(
|
| + WebInspector.UIString('Debugger will skip stepping through this script, and will not stop on exceptions'));
|
|
|
| - this._updateInfobars();
|
| - },
|
| + var scriptFile = this._scriptFileForTarget.size ? this._scriptFileForTarget.valuesArray()[0] : null;
|
| + if (scriptFile && scriptFile.hasSourceMapURL())
|
| + infobar.createDetailsRowMessage(WebInspector.UIString('Source map found, but ignored for blackboxed file.'));
|
| + infobar.createDetailsRowMessage();
|
| + infobar.createDetailsRowMessage(WebInspector.UIString('Possible ways to cancel this behavior are:'));
|
|
|
| - _hideBlackboxInfobar: function()
|
| - {
|
| - if (!this._blackboxInfobar)
|
| - return;
|
| - this._blackboxInfobar.dispose();
|
| - delete this._blackboxInfobar;
|
| - },
|
| + infobar.createDetailsRowMessage(' - ').createTextChild(
|
| + WebInspector.UIString('Go to "%s" tab in settings', WebInspector.UIString('Blackboxing')));
|
| + var unblackboxLink = infobar.createDetailsRowMessage(' - ').createChild('span', 'link');
|
| + unblackboxLink.textContent = WebInspector.UIString('Unblackbox this script');
|
| + unblackboxLink.addEventListener('click', unblackbox, false);
|
|
|
| - /**
|
| - * @override
|
| - */
|
| - wasShown: function()
|
| - {
|
| - WebInspector.UISourceCodeFrame.prototype.wasShown.call(this);
|
| - if (this._executionLocation && this.loaded) {
|
| - // We need SourcesTextEditor to be initialized prior to this call. @see crbug.com/499889
|
| - setImmediate(this._generateValuesInSource.bind(this));
|
| - }
|
| - },
|
| + function unblackbox() {
|
| + WebInspector.blackboxManager.unblackboxUISourceCode(uiSourceCode);
|
| + if (projectType === WebInspector.projectTypes.ContentScripts)
|
| + WebInspector.blackboxManager.unblackboxContentScripts();
|
| + }
|
|
|
| + this._updateInfobars();
|
| + }
|
| +
|
| + _hideBlackboxInfobar() {
|
| + if (!this._blackboxInfobar)
|
| + return;
|
| + this._blackboxInfobar.dispose();
|
| + delete this._blackboxInfobar;
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + wasShown() {
|
| + super.wasShown();
|
| + if (this._executionLocation && this.loaded) {
|
| + // We need SourcesTextEditor to be initialized prior to this call. @see crbug.com/499889
|
| + setImmediate(this._generateValuesInSource.bind(this));
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + willHide() {
|
| + super.willHide();
|
| + this._popoverHelper.hidePopover();
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + onUISourceCodeContentChanged() {
|
| + this._removeAllBreakpoints();
|
| + super.onUISourceCodeContentChanged();
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + onTextChanged(oldRange, newRange) {
|
| + this._scriptsPanel.updateLastModificationTime();
|
| + super.onTextChanged(oldRange, newRange);
|
| + if (this._compiler)
|
| + this._compiler.scheduleCompile();
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @return {!Promise}
|
| + */
|
| + populateLineGutterContextMenu(contextMenu, lineNumber) {
|
| /**
|
| - * @override
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - willHide: function()
|
| - {
|
| - WebInspector.UISourceCodeFrame.prototype.willHide.call(this);
|
| - this._popoverHelper.hidePopover();
|
| - },
|
| -
|
| - onUISourceCodeContentChanged: function()
|
| - {
|
| - this._removeAllBreakpoints();
|
| - WebInspector.UISourceCodeFrame.prototype.onUISourceCodeContentChanged.call(this);
|
| - },
|
| -
|
| + function populate(resolve, reject) {
|
| + var uiLocation = new WebInspector.UILocation(this.uiSourceCode(), lineNumber, 0);
|
| + this._scriptsPanel.appendUILocationItems(contextMenu, uiLocation);
|
| + var breakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), lineNumber);
|
| + if (!breakpoint) {
|
| + // This row doesn't have a breakpoint: We want to show Add Breakpoint and Add and Edit Breakpoint.
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Add breakpoint'), this._createNewBreakpoint.bind(this, lineNumber, 0, '', true));
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Add conditional breakpoint…'), this._editBreakpointCondition.bind(this, lineNumber));
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Never pause here'),
|
| + this._createNewBreakpoint.bind(this, lineNumber, 0, 'false', true));
|
| + } else {
|
| + // This row has a breakpoint, we want to show edit and remove breakpoint, and either disable or enable.
|
| + contextMenu.appendItem(WebInspector.UIString('Remove breakpoint'), breakpoint.remove.bind(breakpoint));
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Edit breakpoint…'),
|
| + this._editBreakpointCondition.bind(this, lineNumber, breakpoint));
|
| + if (breakpoint.enabled())
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Disable breakpoint'), breakpoint.setEnabled.bind(breakpoint, false));
|
| + else
|
| + contextMenu.appendItem(
|
| + WebInspector.UIString('Enable breakpoint'), breakpoint.setEnabled.bind(breakpoint, true));
|
| + }
|
| + resolve();
|
| + }
|
| + return new Promise(populate.bind(this));
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + * @return {!Promise}
|
| + */
|
| + populateTextAreaContextMenu(contextMenu, lineNumber, columnNumber) {
|
| /**
|
| - * @override
|
| + * @param {!WebInspector.ResourceScriptFile} scriptFile
|
| */
|
| - onTextChanged: function(oldRange, newRange)
|
| - {
|
| - this._scriptsPanel.updateLastModificationTime();
|
| - WebInspector.UISourceCodeFrame.prototype.onTextChanged.call(this, oldRange, newRange);
|
| - if (this._compiler)
|
| - this._compiler.scheduleCompile();
|
| - },
|
| + function addSourceMapURL(scriptFile) {
|
| + WebInspector.AddSourceMapURLDialog.show(addSourceMapURLDialogCallback.bind(null, scriptFile));
|
| + }
|
|
|
| /**
|
| - * @override
|
| - * @return {!Promise}
|
| + * @param {!WebInspector.ResourceScriptFile} scriptFile
|
| + * @param {string} url
|
| */
|
| - populateLineGutterContextMenu: function(contextMenu, lineNumber)
|
| - {
|
| - /**
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function populate(resolve, reject)
|
| - {
|
| - var uiLocation = new WebInspector.UILocation(this.uiSourceCode(), lineNumber, 0);
|
| - this._scriptsPanel.appendUILocationItems(contextMenu, uiLocation);
|
| - var breakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), lineNumber);
|
| - if (!breakpoint) {
|
| - // This row doesn't have a breakpoint: We want to show Add Breakpoint and Add and Edit Breakpoint.
|
| - contextMenu.appendItem(WebInspector.UIString("Add breakpoint"), this._createNewBreakpoint.bind(this, lineNumber, 0, "", true));
|
| - contextMenu.appendItem(WebInspector.UIString("Add conditional breakpoint…"), this._editBreakpointCondition.bind(this, lineNumber));
|
| - contextMenu.appendItem(WebInspector.UIString("Never pause here"), this._createNewBreakpoint.bind(this, lineNumber, 0, "false", true));
|
| - } else {
|
| - // This row has a breakpoint, we want to show edit and remove breakpoint, and either disable or enable.
|
| - contextMenu.appendItem(WebInspector.UIString("Remove breakpoint"), breakpoint.remove.bind(breakpoint));
|
| - contextMenu.appendItem(WebInspector.UIString("Edit breakpoint…"), this._editBreakpointCondition.bind(this, lineNumber, breakpoint));
|
| - if (breakpoint.enabled())
|
| - contextMenu.appendItem(WebInspector.UIString("Disable breakpoint"), breakpoint.setEnabled.bind(breakpoint, false));
|
| - else
|
| - contextMenu.appendItem(WebInspector.UIString("Enable breakpoint"), breakpoint.setEnabled.bind(breakpoint, true));
|
| - }
|
| - resolve();
|
| - }
|
| - return new Promise(populate.bind(this));
|
| - },
|
| + function addSourceMapURLDialogCallback(scriptFile, url) {
|
| + if (!url)
|
| + return;
|
| + scriptFile.addSourceMapURL(url);
|
| + }
|
|
|
| /**
|
| - * @override
|
| - * @return {!Promise}
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - populateTextAreaContextMenu: function(contextMenu, lineNumber, columnNumber)
|
| - {
|
| - /**
|
| - * @param {!WebInspector.ResourceScriptFile} scriptFile
|
| - */
|
| - function addSourceMapURL(scriptFile)
|
| - {
|
| - WebInspector.AddSourceMapURLDialog.show(addSourceMapURLDialogCallback.bind(null, scriptFile));
|
| - }
|
| -
|
| - /**
|
| - * @param {!WebInspector.ResourceScriptFile} scriptFile
|
| - * @param {string} url
|
| - */
|
| - function addSourceMapURLDialogCallback(scriptFile, url)
|
| - {
|
| - if (!url)
|
| - return;
|
| - scriptFile.addSourceMapURL(url);
|
| - }
|
| -
|
| - /**
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function populateSourceMapMembers()
|
| - {
|
| - if (this.uiSourceCode().project().type() === WebInspector.projectTypes.Network && WebInspector.moduleSetting("jsSourceMapsEnabled").get() && !WebInspector.blackboxManager.isBlackboxedUISourceCode(this.uiSourceCode())) {
|
| - if (this._scriptFileForTarget.size) {
|
| - var scriptFile = this._scriptFileForTarget.valuesArray()[0];
|
| - var addSourceMapURLLabel = WebInspector.UIString.capitalize("Add ^source ^map\u2026");
|
| - contextMenu.appendItem(addSourceMapURLLabel, addSourceMapURL.bind(null, scriptFile));
|
| - contextMenu.appendSeparator();
|
| - }
|
| - }
|
| + function populateSourceMapMembers() {
|
| + if (this.uiSourceCode().project().type() === WebInspector.projectTypes.Network &&
|
| + WebInspector.moduleSetting('jsSourceMapsEnabled').get() &&
|
| + !WebInspector.blackboxManager.isBlackboxedUISourceCode(this.uiSourceCode())) {
|
| + if (this._scriptFileForTarget.size) {
|
| + var scriptFile = this._scriptFileForTarget.valuesArray()[0];
|
| + var addSourceMapURLLabel = WebInspector.UIString.capitalize('Add ^source ^map\u2026');
|
| + contextMenu.appendItem(addSourceMapURLLabel, addSourceMapURL.bind(null, scriptFile));
|
| + contextMenu.appendSeparator();
|
| }
|
| + }
|
| + }
|
|
|
| - return WebInspector.UISourceCodeFrame.prototype.populateTextAreaContextMenu.call(this, contextMenu, lineNumber, columnNumber).then(populateSourceMapMembers.bind(this));
|
| - },
|
| + return super.populateTextAreaContextMenu(contextMenu, lineNumber, columnNumber)
|
| + .then(populateSourceMapMembers.bind(this));
|
| + }
|
| +
|
| + _workingCopyChanged(event) {
|
| + if (this._supportsEnabledBreakpointsWhileEditing() || this._scriptFileForTarget.size)
|
| + return;
|
| +
|
| + if (this.uiSourceCode().isDirty())
|
| + this._muteBreakpointsWhileEditing();
|
| + else
|
| + this._restoreBreakpointsAfterEditing();
|
| + }
|
| +
|
| + _workingCopyCommitted(event) {
|
| + this._scriptsPanel.updateLastModificationTime();
|
| + if (this._supportsEnabledBreakpointsWhileEditing())
|
| + return;
|
| +
|
| + if (!this._scriptFileForTarget.size)
|
| + this._restoreBreakpointsAfterEditing();
|
| + }
|
| +
|
| + _didMergeToVM() {
|
| + if (this._supportsEnabledBreakpointsWhileEditing())
|
| + return;
|
| + this._updateDivergedInfobar();
|
| + this._restoreBreakpointsIfConsistentScripts();
|
| + }
|
| +
|
| + _didDivergeFromVM() {
|
| + if (this._supportsEnabledBreakpointsWhileEditing())
|
| + return;
|
| + this._updateDivergedInfobar();
|
| + this._muteBreakpointsWhileEditing();
|
| + }
|
| +
|
| + _muteBreakpointsWhileEditing() {
|
| + if (this._muted)
|
| + return;
|
| + for (var lineNumber = 0; lineNumber < this._textEditor.linesCount; ++lineNumber) {
|
| + var breakpointDecoration = this._textEditor.getAttribute(lineNumber, 'breakpoint');
|
| + if (!breakpointDecoration)
|
| + continue;
|
| + this._removeBreakpointDecoration(lineNumber);
|
| + this._addBreakpointDecoration(
|
| + lineNumber, breakpointDecoration.columnNumber, breakpointDecoration.condition, breakpointDecoration.enabled,
|
| + true);
|
| + }
|
| + this._muted = true;
|
| + }
|
|
|
| - _workingCopyChanged: function(event)
|
| - {
|
| - if (this._supportsEnabledBreakpointsWhileEditing() || this._scriptFileForTarget.size)
|
| - return;
|
| + _updateDivergedInfobar() {
|
| + if (this.uiSourceCode().project().type() !== WebInspector.projectTypes.FileSystem) {
|
| + this._hideDivergedInfobar();
|
| + return;
|
| + }
|
|
|
| - if (this.uiSourceCode().isDirty())
|
| - this._muteBreakpointsWhileEditing();
|
| - else
|
| - this._restoreBreakpointsAfterEditing();
|
| - },
|
| -
|
| - _workingCopyCommitted: function(event)
|
| - {
|
| - this._scriptsPanel.updateLastModificationTime();
|
| - if (this._supportsEnabledBreakpointsWhileEditing())
|
| - return;
|
| -
|
| - if (!this._scriptFileForTarget.size)
|
| - this._restoreBreakpointsAfterEditing();
|
| - },
|
| -
|
| - _didMergeToVM: function()
|
| - {
|
| - if (this._supportsEnabledBreakpointsWhileEditing())
|
| - return;
|
| - this._updateDivergedInfobar();
|
| - this._restoreBreakpointsIfConsistentScripts();
|
| - },
|
| -
|
| - _didDivergeFromVM: function()
|
| - {
|
| - if (this._supportsEnabledBreakpointsWhileEditing())
|
| - return;
|
| - this._updateDivergedInfobar();
|
| - this._muteBreakpointsWhileEditing();
|
| - },
|
| -
|
| - _muteBreakpointsWhileEditing: function()
|
| - {
|
| - if (this._muted)
|
| - return;
|
| - for (var lineNumber = 0; lineNumber < this._textEditor.linesCount; ++lineNumber) {
|
| - var breakpointDecoration = this._textEditor.getAttribute(lineNumber, "breakpoint");
|
| - if (!breakpointDecoration)
|
| - continue;
|
| - this._removeBreakpointDecoration(lineNumber);
|
| - this._addBreakpointDecoration(lineNumber, breakpointDecoration.columnNumber, breakpointDecoration.condition, breakpointDecoration.enabled, true);
|
| - }
|
| - this._muted = true;
|
| - },
|
| -
|
| - _updateDivergedInfobar: function()
|
| - {
|
| - if (this.uiSourceCode().project().type() !== WebInspector.projectTypes.FileSystem) {
|
| - this._hideDivergedInfobar();
|
| - return;
|
| - }
|
| + var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| + var hasDivergedScript = false;
|
| + for (var i = 0; i < scriptFiles.length; ++i)
|
| + hasDivergedScript = hasDivergedScript || scriptFiles[i].hasDivergedFromVM();
|
| +
|
| + if (this._divergedInfobar) {
|
| + if (!hasDivergedScript)
|
| + this._hideDivergedInfobar();
|
| + } else {
|
| + if (hasDivergedScript && !this.uiSourceCode().isDirty())
|
| + this._showDivergedInfobar();
|
| + }
|
| + }
|
| +
|
| + _supportsEnabledBreakpointsWhileEditing() {
|
| + return this.uiSourceCode().project().type() === WebInspector.projectTypes.Snippets;
|
| + }
|
| +
|
| + _restoreBreakpointsIfConsistentScripts() {
|
| + var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| + for (var i = 0; i < scriptFiles.length; ++i)
|
| + if (scriptFiles[i].hasDivergedFromVM() || scriptFiles[i].isMergingToVM())
|
| + return;
|
| +
|
| + this._restoreBreakpointsAfterEditing();
|
| + }
|
| +
|
| + _restoreBreakpointsAfterEditing() {
|
| + delete this._muted;
|
| + var breakpoints = {};
|
| + // Save and remove muted breakpoint decorations.
|
| + for (var lineNumber = 0; lineNumber < this._textEditor.linesCount; ++lineNumber) {
|
| + var breakpointDecoration = this._textEditor.getAttribute(lineNumber, 'breakpoint');
|
| + if (breakpointDecoration) {
|
| + breakpoints[lineNumber] = breakpointDecoration;
|
| + this._removeBreakpointDecoration(lineNumber);
|
| + }
|
| + }
|
|
|
| - var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| - var hasDivergedScript = false;
|
| - for (var i = 0; i < scriptFiles.length; ++i)
|
| - hasDivergedScript = hasDivergedScript || scriptFiles[i].hasDivergedFromVM();
|
| -
|
| - if (this._divergedInfobar) {
|
| - if (!hasDivergedScript)
|
| - this._hideDivergedInfobar();
|
| - } else {
|
| - if (hasDivergedScript && !this.uiSourceCode().isDirty())
|
| - this._showDivergedInfobar();
|
| - }
|
| - },
|
| -
|
| - _supportsEnabledBreakpointsWhileEditing: function()
|
| - {
|
| - return this.uiSourceCode().project().type() === WebInspector.projectTypes.Snippets;
|
| - },
|
| -
|
| - _restoreBreakpointsIfConsistentScripts: function()
|
| - {
|
| - var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| - for (var i = 0; i < scriptFiles.length; ++i)
|
| - if (scriptFiles[i].hasDivergedFromVM() || scriptFiles[i].isMergingToVM())
|
| - return;
|
| -
|
| - this._restoreBreakpointsAfterEditing();
|
| - },
|
| -
|
| - _restoreBreakpointsAfterEditing: function()
|
| - {
|
| - delete this._muted;
|
| - var breakpoints = {};
|
| - // Save and remove muted breakpoint decorations.
|
| - for (var lineNumber = 0; lineNumber < this._textEditor.linesCount; ++lineNumber) {
|
| - var breakpointDecoration = this._textEditor.getAttribute(lineNumber, "breakpoint");
|
| - if (breakpointDecoration) {
|
| - breakpoints[lineNumber] = breakpointDecoration;
|
| - this._removeBreakpointDecoration(lineNumber);
|
| - }
|
| - }
|
| + // Remove all breakpoints.
|
| + this._removeAllBreakpoints();
|
| +
|
| + // Restore all breakpoints from saved decorations.
|
| + for (var lineNumberString in breakpoints) {
|
| + var lineNumber = parseInt(lineNumberString, 10);
|
| + if (isNaN(lineNumber))
|
| + continue;
|
| + var breakpointDecoration = breakpoints[lineNumberString];
|
| + this._setBreakpoint(
|
| + lineNumber, breakpointDecoration.columnNumber, breakpointDecoration.condition, breakpointDecoration.enabled);
|
| + }
|
| + }
|
| +
|
| + _removeAllBreakpoints() {
|
| + var breakpoints = this._breakpointManager.breakpointsForUISourceCode(this.uiSourceCode());
|
| + for (var i = 0; i < breakpoints.length; ++i)
|
| + breakpoints[i].remove();
|
| + }
|
| +
|
| + /**
|
| + * @param {string} tokenType
|
| + * @return {boolean}
|
| + */
|
| + _isIdentifier(tokenType) {
|
| + return tokenType.startsWith('js-variable') || tokenType.startsWith('js-property') || tokenType === 'js-def';
|
| + }
|
| +
|
| + _getPopoverAnchor(element, event) {
|
| + var target = WebInspector.context.flavor(WebInspector.Target);
|
| + var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
|
| + if (!debuggerModel || !debuggerModel.isPaused())
|
| + return;
|
| +
|
| + var textPosition = this.textEditor.coordinatesToCursorPosition(event.x, event.y);
|
| + if (!textPosition)
|
| + return;
|
| + var mouseLine = textPosition.startLine;
|
| + var mouseColumn = textPosition.startColumn;
|
| + var textSelection = this.textEditor.selection().normalize();
|
| + if (textSelection && !textSelection.isEmpty()) {
|
| + if (textSelection.startLine !== textSelection.endLine || textSelection.startLine !== mouseLine ||
|
| + mouseColumn < textSelection.startColumn || mouseColumn > textSelection.endColumn)
|
| + return;
|
| +
|
| + var leftCorner = this.textEditor.cursorPositionToCoordinates(textSelection.startLine, textSelection.startColumn);
|
| + var rightCorner = this.textEditor.cursorPositionToCoordinates(textSelection.endLine, textSelection.endColumn);
|
| + var anchorBox = new AnchorBox(leftCorner.x, leftCorner.y, rightCorner.x - leftCorner.x, leftCorner.height);
|
| + anchorBox.highlight = {
|
| + lineNumber: textSelection.startLine,
|
| + startColumn: textSelection.startColumn,
|
| + endColumn: textSelection.endColumn - 1
|
| + };
|
| + anchorBox.forSelection = true;
|
| + return anchorBox;
|
| + }
|
|
|
| - // Remove all breakpoints.
|
| - this._removeAllBreakpoints();
|
| + var token = this.textEditor.tokenAtTextPosition(textPosition.startLine, textPosition.startColumn);
|
| + if (!token || !token.type)
|
| + return;
|
| + var lineNumber = textPosition.startLine;
|
| + var line = this.textEditor.line(lineNumber);
|
| + var tokenContent = line.substring(token.startColumn, token.endColumn);
|
|
|
| - // Restore all breakpoints from saved decorations.
|
| - for (var lineNumberString in breakpoints) {
|
| - var lineNumber = parseInt(lineNumberString, 10);
|
| - if (isNaN(lineNumber))
|
| - continue;
|
| - var breakpointDecoration = breakpoints[lineNumberString];
|
| - this._setBreakpoint(lineNumber, breakpointDecoration.columnNumber, breakpointDecoration.condition, breakpointDecoration.enabled);
|
| - }
|
| - },
|
| + var isIdentifier = this._isIdentifier(token.type);
|
| + if (!isIdentifier && (token.type !== 'js-keyword' || tokenContent !== 'this'))
|
| + return;
|
|
|
| - _removeAllBreakpoints: function()
|
| - {
|
| - var breakpoints = this._breakpointManager.breakpointsForUISourceCode(this.uiSourceCode());
|
| - for (var i = 0; i < breakpoints.length; ++i)
|
| - breakpoints[i].remove();
|
| - },
|
| + var leftCorner = this.textEditor.cursorPositionToCoordinates(lineNumber, token.startColumn);
|
| + var rightCorner = this.textEditor.cursorPositionToCoordinates(lineNumber, token.endColumn - 1);
|
| + var anchorBox = new AnchorBox(leftCorner.x, leftCorner.y, rightCorner.x - leftCorner.x, leftCorner.height);
|
|
|
| - /**
|
| - * @param {string} tokenType
|
| - * @return {boolean}
|
| - */
|
| - _isIdentifier: function(tokenType)
|
| - {
|
| - return tokenType.startsWith("js-variable") || tokenType.startsWith("js-property") || tokenType === "js-def";
|
| - },
|
| -
|
| - _getPopoverAnchor: function(element, event)
|
| - {
|
| - var target = WebInspector.context.flavor(WebInspector.Target);
|
| - var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
|
| - if (!debuggerModel || !debuggerModel.isPaused())
|
| - return;
|
| -
|
| - var textPosition = this.textEditor.coordinatesToCursorPosition(event.x, event.y);
|
| - if (!textPosition)
|
| - return;
|
| - var mouseLine = textPosition.startLine;
|
| - var mouseColumn = textPosition.startColumn;
|
| - var textSelection = this.textEditor.selection().normalize();
|
| - if (textSelection && !textSelection.isEmpty()) {
|
| - if (textSelection.startLine !== textSelection.endLine || textSelection.startLine !== mouseLine || mouseColumn < textSelection.startColumn || mouseColumn > textSelection.endColumn)
|
| - return;
|
| -
|
| - var leftCorner = this.textEditor.cursorPositionToCoordinates(textSelection.startLine, textSelection.startColumn);
|
| - var rightCorner = this.textEditor.cursorPositionToCoordinates(textSelection.endLine, textSelection.endColumn);
|
| - var anchorBox = new AnchorBox(leftCorner.x, leftCorner.y, rightCorner.x - leftCorner.x, leftCorner.height);
|
| - anchorBox.highlight = {
|
| - lineNumber: textSelection.startLine,
|
| - startColumn: textSelection.startColumn,
|
| - endColumn: textSelection.endColumn - 1
|
| - };
|
| - anchorBox.forSelection = true;
|
| - return anchorBox;
|
| - }
|
| + anchorBox.highlight = {lineNumber: lineNumber, startColumn: token.startColumn, endColumn: token.endColumn - 1};
|
|
|
| - var token = this.textEditor.tokenAtTextPosition(textPosition.startLine, textPosition.startColumn);
|
| - if (!token || !token.type)
|
| - return;
|
| - var lineNumber = textPosition.startLine;
|
| - var line = this.textEditor.line(lineNumber);
|
| - var tokenContent = line.substring(token.startColumn, token.endColumn);
|
| -
|
| - var isIdentifier = this._isIdentifier(token.type);
|
| - if (!isIdentifier && (token.type !== "js-keyword" || tokenContent !== "this"))
|
| - return;
|
| -
|
| - var leftCorner = this.textEditor.cursorPositionToCoordinates(lineNumber, token.startColumn);
|
| - var rightCorner = this.textEditor.cursorPositionToCoordinates(lineNumber, token.endColumn - 1);
|
| - var anchorBox = new AnchorBox(leftCorner.x, leftCorner.y, rightCorner.x - leftCorner.x, leftCorner.height);
|
| -
|
| - anchorBox.highlight = {
|
| - lineNumber: lineNumber,
|
| - startColumn: token.startColumn,
|
| - endColumn: token.endColumn - 1
|
| - };
|
| -
|
| - return anchorBox;
|
| - },
|
| -
|
| - _resolveObjectForPopover: function(anchorBox, showCallback, objectGroupName)
|
| - {
|
| - var target = WebInspector.context.flavor(WebInspector.Target);
|
| - var selectedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| - if (!selectedCallFrame) {
|
| - this._popoverHelper.hidePopover();
|
| - return;
|
| - }
|
| - var lineNumber = anchorBox.highlight.lineNumber;
|
| - var startHighlight = anchorBox.highlight.startColumn;
|
| - var endHighlight = anchorBox.highlight.endColumn;
|
| - var line = this.textEditor.line(lineNumber);
|
| - if (!anchorBox.forSelection) {
|
| - while (startHighlight > 1 && line.charAt(startHighlight - 1) === ".") {
|
| - var token = this.textEditor.tokenAtTextPosition(lineNumber, startHighlight - 2);
|
| - if (!token || !token.type) {
|
| - this._popoverHelper.hidePopover();
|
| - return;
|
| - }
|
| - startHighlight = token.startColumn;
|
| - }
|
| - }
|
| - var evaluationText = line.substring(startHighlight, endHighlight + 1);
|
| - WebInspector.SourceMapNamesResolver.resolveExpression(selectedCallFrame, evaluationText, this.uiSourceCode(), lineNumber, startHighlight, endHighlight).then(onResolve.bind(this));
|
| -
|
| - /**
|
| - * @param {?string=} text
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function onResolve(text)
|
| - {
|
| - selectedCallFrame.evaluate(text || evaluationText, objectGroupName, false, true, false, false, showObjectPopover.bind(this));
|
| - }
|
| + return anchorBox;
|
| + }
|
|
|
| - /**
|
| - * @param {?RuntimeAgent.RemoteObject} result
|
| - * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function showObjectPopover(result, exceptionDetails)
|
| - {
|
| - var target = WebInspector.context.flavor(WebInspector.Target);
|
| - var potentiallyUpdatedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| - if (selectedCallFrame !== potentiallyUpdatedCallFrame || !result) {
|
| - this._popoverHelper.hidePopover();
|
| - return;
|
| - }
|
| - this._popoverAnchorBox = anchorBox;
|
| - showCallback(target.runtimeModel.createRemoteObject(result), !!exceptionDetails, this._popoverAnchorBox);
|
| - // Popover may have been removed by showCallback().
|
| - if (this._popoverAnchorBox) {
|
| - var highlightRange = new WebInspector.TextRange(lineNumber, startHighlight, lineNumber, endHighlight);
|
| - this._popoverAnchorBox._highlightDescriptor = this.textEditor.highlightRange(highlightRange, "source-frame-eval-expression");
|
| - }
|
| + _resolveObjectForPopover(anchorBox, showCallback, objectGroupName) {
|
| + var target = WebInspector.context.flavor(WebInspector.Target);
|
| + var selectedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| + if (!selectedCallFrame) {
|
| + this._popoverHelper.hidePopover();
|
| + return;
|
| + }
|
| + var lineNumber = anchorBox.highlight.lineNumber;
|
| + var startHighlight = anchorBox.highlight.startColumn;
|
| + var endHighlight = anchorBox.highlight.endColumn;
|
| + var line = this.textEditor.line(lineNumber);
|
| + if (!anchorBox.forSelection) {
|
| + while (startHighlight > 1 && line.charAt(startHighlight - 1) === '.') {
|
| + var token = this.textEditor.tokenAtTextPosition(lineNumber, startHighlight - 2);
|
| + if (!token || !token.type) {
|
| + this._popoverHelper.hidePopover();
|
| + return;
|
| }
|
| - },
|
| -
|
| - _onHidePopover: function()
|
| - {
|
| - if (!this._popoverAnchorBox)
|
| - return;
|
| - if (this._popoverAnchorBox._highlightDescriptor)
|
| - this.textEditor.removeHighlight(this._popoverAnchorBox._highlightDescriptor);
|
| - delete this._popoverAnchorBox;
|
| - },
|
| + startHighlight = token.startColumn;
|
| + }
|
| + }
|
| + var evaluationText = line.substring(startHighlight, endHighlight + 1);
|
| + WebInspector.SourceMapNamesResolver
|
| + .resolveExpression(
|
| + selectedCallFrame, evaluationText, this.uiSourceCode(), lineNumber, startHighlight, endHighlight)
|
| + .then(onResolve.bind(this));
|
|
|
| /**
|
| - * @param {number} lineNumber
|
| - * @param {number} columnNumber
|
| - * @param {string} condition
|
| - * @param {boolean} enabled
|
| - * @param {boolean} mutedWhileEditing
|
| + * @param {?string=} text
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - _addBreakpointDecoration: function(lineNumber, columnNumber, condition, enabled, mutedWhileEditing)
|
| - {
|
| - var breakpoint = {
|
| - condition: condition,
|
| - enabled: enabled,
|
| - columnNumber: columnNumber
|
| - };
|
| -
|
| - this.textEditor.setAttribute(lineNumber, "breakpoint", breakpoint);
|
| -
|
| - var disabled = !enabled || mutedWhileEditing;
|
| - this.textEditor.addBreakpoint(lineNumber, disabled, !!condition);
|
| - },
|
| -
|
| - _removeBreakpointDecoration: function(lineNumber)
|
| - {
|
| - this.textEditor.removeAttribute(lineNumber, "breakpoint");
|
| - this.textEditor.removeBreakpoint(lineNumber);
|
| - },
|
| -
|
| - _onKeyDown: function(event)
|
| - {
|
| - if (event.key === "Escape") {
|
| - if (this._popoverHelper.isPopoverVisible()) {
|
| - this._popoverHelper.hidePopover();
|
| - event.consume();
|
| - }
|
| - }
|
| - },
|
| + function onResolve(text) {
|
| + selectedCallFrame.evaluate(
|
| + text || evaluationText, objectGroupName, false, true, false, false, showObjectPopover.bind(this));
|
| + }
|
|
|
| /**
|
| - * @param {number} lineNumber
|
| - * @param {!WebInspector.BreakpointManager.Breakpoint=} breakpoint
|
| + * @param {?RuntimeAgent.RemoteObject} result
|
| + * @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - _editBreakpointCondition: function(lineNumber, breakpoint)
|
| - {
|
| - this._conditionElement = this._createConditionElement(lineNumber);
|
| - this.textEditor.addDecoration(this._conditionElement, lineNumber);
|
| -
|
| - /**
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function finishEditing(committed, element, newText)
|
| - {
|
| - this.textEditor.removeDecoration(this._conditionElement, lineNumber);
|
| - delete this._conditionEditorElement;
|
| - delete this._conditionElement;
|
| - if (!committed)
|
| - return;
|
| -
|
| - if (breakpoint)
|
| - breakpoint.setCondition(newText);
|
| - else
|
| - this._createNewBreakpoint(lineNumber, 0, newText, true);
|
| - }
|
| -
|
| - var config = new WebInspector.InplaceEditor.Config(finishEditing.bind(this, true), finishEditing.bind(this, false));
|
| - WebInspector.InplaceEditor.startEditing(this._conditionEditorElement, config);
|
| - this._conditionEditorElement.value = breakpoint ? breakpoint.condition() : "";
|
| - this._conditionEditorElement.select();
|
| - },
|
| -
|
| - _createConditionElement: function(lineNumber)
|
| - {
|
| - var conditionElement = createElementWithClass("div", "source-frame-breakpoint-condition");
|
| -
|
| - var labelElement = conditionElement.createChild("label", "source-frame-breakpoint-message");
|
| - labelElement.htmlFor = "source-frame-breakpoint-condition";
|
| - labelElement.createTextChild(WebInspector.UIString("The breakpoint on line %d will stop only if this expression is true:", lineNumber + 1));
|
| -
|
| - var editorElement = conditionElement.createChild("input", "monospace");
|
| - editorElement.id = "source-frame-breakpoint-condition";
|
| - editorElement.type = "text";
|
| - this._conditionEditorElement = editorElement;
|
| + function showObjectPopover(result, exceptionDetails) {
|
| + var target = WebInspector.context.flavor(WebInspector.Target);
|
| + var potentiallyUpdatedCallFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| + if (selectedCallFrame !== potentiallyUpdatedCallFrame || !result) {
|
| + this._popoverHelper.hidePopover();
|
| + return;
|
| + }
|
| + this._popoverAnchorBox = anchorBox;
|
| + showCallback(target.runtimeModel.createRemoteObject(result), !!exceptionDetails, this._popoverAnchorBox);
|
| + // Popover may have been removed by showCallback().
|
| + if (this._popoverAnchorBox) {
|
| + var highlightRange = new WebInspector.TextRange(lineNumber, startHighlight, lineNumber, endHighlight);
|
| + this._popoverAnchorBox._highlightDescriptor =
|
| + this.textEditor.highlightRange(highlightRange, 'source-frame-eval-expression');
|
| + }
|
| + }
|
| + }
|
| +
|
| + _onHidePopover() {
|
| + if (!this._popoverAnchorBox)
|
| + return;
|
| + if (this._popoverAnchorBox._highlightDescriptor)
|
| + this.textEditor.removeHighlight(this._popoverAnchorBox._highlightDescriptor);
|
| + delete this._popoverAnchorBox;
|
| + }
|
| +
|
| + /**
|
| + * @param {number} lineNumber
|
| + * @param {number} columnNumber
|
| + * @param {string} condition
|
| + * @param {boolean} enabled
|
| + * @param {boolean} mutedWhileEditing
|
| + */
|
| + _addBreakpointDecoration(lineNumber, columnNumber, condition, enabled, mutedWhileEditing) {
|
| + var breakpoint = {condition: condition, enabled: enabled, columnNumber: columnNumber};
|
| +
|
| + this.textEditor.setAttribute(lineNumber, 'breakpoint', breakpoint);
|
| +
|
| + var disabled = !enabled || mutedWhileEditing;
|
| + this.textEditor.addBreakpoint(lineNumber, disabled, !!condition);
|
| + }
|
| +
|
| + _removeBreakpointDecoration(lineNumber) {
|
| + this.textEditor.removeAttribute(lineNumber, 'breakpoint');
|
| + this.textEditor.removeBreakpoint(lineNumber);
|
| + }
|
| +
|
| + _onKeyDown(event) {
|
| + if (event.key === 'Escape') {
|
| + if (this._popoverHelper.isPopoverVisible()) {
|
| + this._popoverHelper.hidePopover();
|
| + event.consume();
|
| + }
|
| + }
|
| + }
|
|
|
| - return conditionElement;
|
| - },
|
| + /**
|
| + * @param {number} lineNumber
|
| + * @param {!WebInspector.BreakpointManager.Breakpoint=} breakpoint
|
| + */
|
| + _editBreakpointCondition(lineNumber, breakpoint) {
|
| + this._conditionElement = this._createConditionElement(lineNumber);
|
| + this.textEditor.addDecoration(this._conditionElement, lineNumber);
|
|
|
| /**
|
| - * @param {!WebInspector.UILocation} uiLocation
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - setExecutionLocation: function(uiLocation)
|
| - {
|
| - this._executionLocation = uiLocation;
|
| - if (!this.loaded)
|
| - return;
|
| -
|
| - this.textEditor.setExecutionLocation(uiLocation.lineNumber, uiLocation.columnNumber);
|
| - if (this.isShowing()) {
|
| - // We need SourcesTextEditor to be initialized prior to this call. @see crbug.com/506566
|
| - setImmediate(this._generateValuesInSource.bind(this));
|
| - }
|
| - },
|
| -
|
| - _generateValuesInSource: function()
|
| - {
|
| - if (!WebInspector.moduleSetting("inlineVariableValues").get())
|
| - return;
|
| - var executionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
|
| - if (!executionContext)
|
| - return;
|
| - var callFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| - if (!callFrame)
|
| - return;
|
| -
|
| - var localScope = callFrame.localScope();
|
| - var functionLocation = callFrame.functionLocation();
|
| - if (localScope && functionLocation)
|
| - WebInspector.SourceMapNamesResolver.resolveScopeInObject(localScope).getAllProperties(false, this._prepareScopeVariables.bind(this, callFrame));
|
| -
|
| - if (this._clearValueWidgetsTimer) {
|
| - clearTimeout(this._clearValueWidgetsTimer);
|
| - delete this._clearValueWidgetsTimer;
|
| - }
|
| - },
|
| + function finishEditing(committed, element, newText) {
|
| + this.textEditor.removeDecoration(this._conditionElement, lineNumber);
|
| + delete this._conditionEditorElement;
|
| + delete this._conditionElement;
|
| + if (!committed)
|
| + return;
|
| +
|
| + if (breakpoint)
|
| + breakpoint.setCondition(newText);
|
| + else
|
| + this._createNewBreakpoint(lineNumber, 0, newText, true);
|
| + }
|
|
|
| - /**
|
| - * @param {!WebInspector.DebuggerModel.CallFrame} callFrame
|
| - * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties
|
| - * @param {?Array.<!WebInspector.RemoteObjectProperty>} internalProperties
|
| - */
|
| - _prepareScopeVariables: function(callFrame, properties, internalProperties)
|
| - {
|
| - if (!properties || !properties.length || properties.length > 500) {
|
| - this._clearValueWidgets();
|
| - return;
|
| - }
|
| + var config = new WebInspector.InplaceEditor.Config(finishEditing.bind(this, true), finishEditing.bind(this, false));
|
| + WebInspector.InplaceEditor.startEditing(this._conditionEditorElement, config);
|
| + this._conditionEditorElement.value = breakpoint ? breakpoint.condition() : '';
|
| + this._conditionEditorElement.select();
|
| + }
|
| +
|
| + _createConditionElement(lineNumber) {
|
| + var conditionElement = createElementWithClass('div', 'source-frame-breakpoint-condition');
|
| +
|
| + var labelElement = conditionElement.createChild('label', 'source-frame-breakpoint-message');
|
| + labelElement.htmlFor = 'source-frame-breakpoint-condition';
|
| + labelElement.createTextChild(
|
| + WebInspector.UIString('The breakpoint on line %d will stop only if this expression is true:', lineNumber + 1));
|
| +
|
| + var editorElement = conditionElement.createChild('input', 'monospace');
|
| + editorElement.id = 'source-frame-breakpoint-condition';
|
| + editorElement.type = 'text';
|
| + this._conditionEditorElement = editorElement;
|
| +
|
| + return conditionElement;
|
| + }
|
| +
|
| + /**
|
| + * @param {!WebInspector.UILocation} uiLocation
|
| + */
|
| + setExecutionLocation(uiLocation) {
|
| + this._executionLocation = uiLocation;
|
| + if (!this.loaded)
|
| + return;
|
| +
|
| + this.textEditor.setExecutionLocation(uiLocation.lineNumber, uiLocation.columnNumber);
|
| + if (this.isShowing()) {
|
| + // We need SourcesTextEditor to be initialized prior to this call. @see crbug.com/506566
|
| + setImmediate(this._generateValuesInSource.bind(this));
|
| + }
|
| + }
|
| +
|
| + _generateValuesInSource() {
|
| + if (!WebInspector.moduleSetting('inlineVariableValues').get())
|
| + return;
|
| + var executionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
|
| + if (!executionContext)
|
| + return;
|
| + var callFrame = WebInspector.context.flavor(WebInspector.DebuggerModel.CallFrame);
|
| + if (!callFrame)
|
| + return;
|
| +
|
| + var localScope = callFrame.localScope();
|
| + var functionLocation = callFrame.functionLocation();
|
| + if (localScope && functionLocation)
|
| + WebInspector.SourceMapNamesResolver.resolveScopeInObject(localScope)
|
| + .getAllProperties(false, this._prepareScopeVariables.bind(this, callFrame));
|
| +
|
| + if (this._clearValueWidgetsTimer) {
|
| + clearTimeout(this._clearValueWidgetsTimer);
|
| + delete this._clearValueWidgetsTimer;
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * @param {!WebInspector.DebuggerModel.CallFrame} callFrame
|
| + * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties
|
| + * @param {?Array.<!WebInspector.RemoteObjectProperty>} internalProperties
|
| + */
|
| + _prepareScopeVariables(callFrame, properties, internalProperties) {
|
| + if (!properties || !properties.length || properties.length > 500) {
|
| + this._clearValueWidgets();
|
| + return;
|
| + }
|
|
|
| - var functionUILocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(/** @type {!WebInspector.DebuggerModel.Location} */ (callFrame.functionLocation()));
|
| - var executionUILocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(callFrame.location());
|
| - if (functionUILocation.uiSourceCode !== this.uiSourceCode() || executionUILocation.uiSourceCode !== this.uiSourceCode()) {
|
| - this._clearValueWidgets();
|
| - return;
|
| - }
|
| + var functionUILocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(
|
| + /** @type {!WebInspector.DebuggerModel.Location} */ (callFrame.functionLocation()));
|
| + var executionUILocation = WebInspector.debuggerWorkspaceBinding.rawLocationToUILocation(callFrame.location());
|
| + if (functionUILocation.uiSourceCode !== this.uiSourceCode() ||
|
| + executionUILocation.uiSourceCode !== this.uiSourceCode()) {
|
| + this._clearValueWidgets();
|
| + return;
|
| + }
|
|
|
| - var fromLine = functionUILocation.lineNumber;
|
| - var fromColumn = functionUILocation.columnNumber;
|
| - var toLine = executionUILocation.lineNumber;
|
| + var fromLine = functionUILocation.lineNumber;
|
| + var fromColumn = functionUILocation.columnNumber;
|
| + var toLine = executionUILocation.lineNumber;
|
|
|
| - // Make sure we have a chance to update all existing widgets.
|
| - if (this._valueWidgets) {
|
| - for (var line of this._valueWidgets.keys())
|
| - toLine = Math.max(toLine, line + 1);
|
| - }
|
| - if (fromLine >= toLine || toLine - fromLine > 500 || fromLine < 0 || toLine >= this.textEditor.linesCount) {
|
| - this._clearValueWidgets();
|
| - return;
|
| - }
|
| + // Make sure we have a chance to update all existing widgets.
|
| + if (this._valueWidgets) {
|
| + for (var line of this._valueWidgets.keys())
|
| + toLine = Math.max(toLine, line + 1);
|
| + }
|
| + if (fromLine >= toLine || toLine - fromLine > 500 || fromLine < 0 || toLine >= this.textEditor.linesCount) {
|
| + this._clearValueWidgets();
|
| + return;
|
| + }
|
|
|
| - var valuesMap = new Map();
|
| - for (var property of properties)
|
| - valuesMap.set(property.name, property.value);
|
| -
|
| - /** @type {!Map.<number, !Set<string>>} */
|
| - var namesPerLine = new Map();
|
| - var skipObjectProperty = false;
|
| - var tokenizer = new WebInspector.CodeMirrorUtils.TokenizerFactory().createTokenizer("text/javascript");
|
| - tokenizer(this.textEditor.line(fromLine).substring(fromColumn), processToken.bind(this, fromLine));
|
| - for (var i = fromLine + 1; i < toLine; ++i)
|
| - tokenizer(this.textEditor.line(i), processToken.bind(this, i));
|
| -
|
| - /**
|
| - * @param {number} lineNumber
|
| - * @param {string} tokenValue
|
| - * @param {?string} tokenType
|
| - * @param {number} column
|
| - * @param {number} newColumn
|
| - * @this {WebInspector.JavaScriptSourceFrame}
|
| - */
|
| - function processToken(lineNumber, tokenValue, tokenType, column, newColumn)
|
| - {
|
| - if (!skipObjectProperty && tokenType && this._isIdentifier(tokenType) && valuesMap.get(tokenValue)) {
|
| - var names = namesPerLine.get(lineNumber);
|
| - if (!names) {
|
| - names = new Set();
|
| - namesPerLine.set(lineNumber, names);
|
| - }
|
| - names.add(tokenValue);
|
| - }
|
| - skipObjectProperty = tokenValue === ".";
|
| - }
|
| - this.textEditor.operation(this._renderDecorations.bind(this, valuesMap, namesPerLine, fromLine, toLine));
|
| - },
|
| + var valuesMap = new Map();
|
| + for (var property of properties)
|
| + valuesMap.set(property.name, property.value);
|
|
|
| - /**
|
| - * @param {!Map.<string,!WebInspector.RemoteObject>} valuesMap
|
| - * @param {!Map.<number, !Set<string>>} namesPerLine
|
| - * @param {number} fromLine
|
| - * @param {number} toLine
|
| - */
|
| - _renderDecorations: function(valuesMap, namesPerLine, fromLine, toLine)
|
| - {
|
| - var formatter = new WebInspector.RemoteObjectPreviewFormatter();
|
| - for (var i = fromLine; i < toLine; ++i) {
|
| - var names = namesPerLine.get(i);
|
| - var oldWidget = this._valueWidgets.get(i);
|
| - if (!names) {
|
| - if (oldWidget) {
|
| - this._valueWidgets.delete(i);
|
| - this.textEditor.removeDecoration(oldWidget, i);
|
| - }
|
| - continue;
|
| - }
|
| -
|
| - var widget = createElementWithClass("div", "text-editor-value-decoration");
|
| - var base = this.textEditor.cursorPositionToCoordinates(i, 0);
|
| - var offset = this.textEditor.cursorPositionToCoordinates(i, this.textEditor.line(i).length);
|
| - var codeMirrorLinesLeftPadding = 4;
|
| - var left = offset.x - base.x + codeMirrorLinesLeftPadding;
|
| - widget.style.left = left + "px";
|
| - widget.__nameToToken = new Map();
|
| -
|
| - var renderedNameCount = 0;
|
| - for (var name of names) {
|
| - if (renderedNameCount > 10)
|
| - break;
|
| - if (namesPerLine.get(i - 1) && namesPerLine.get(i - 1).has(name))
|
| - continue; // Only render name once in the given continuous block.
|
| - if (renderedNameCount)
|
| - widget.createTextChild(", ");
|
| - var nameValuePair = widget.createChild("span");
|
| - widget.__nameToToken.set(name, nameValuePair);
|
| - nameValuePair.createTextChild(name + " = ");
|
| - var value = valuesMap.get(name);
|
| - var propertyCount = value.preview ? value.preview.properties.length : 0;
|
| - var entryCount = value.preview && value.preview.entries ? value.preview.entries.length : 0;
|
| - if (value.preview && propertyCount + entryCount < 10)
|
| - formatter.appendObjectPreview(nameValuePair, value.preview);
|
| - else
|
| - nameValuePair.appendChild(WebInspector.ObjectPropertiesSection.createValueElement(value, false));
|
| - ++renderedNameCount;
|
| - }
|
| -
|
| - var widgetChanged = true;
|
| - if (oldWidget) {
|
| - widgetChanged = false;
|
| - for (var name of widget.__nameToToken.keys()) {
|
| - var oldText = oldWidget.__nameToToken.get(name) ? oldWidget.__nameToToken.get(name).textContent : "";
|
| - var newText = widget.__nameToToken.get(name) ? widget.__nameToToken.get(name).textContent : "";
|
| - if (newText !== oldText) {
|
| - widgetChanged = true;
|
| - // value has changed, update it.
|
| - WebInspector.runCSSAnimationOnce(/** @type {!Element} */ (widget.__nameToToken.get(name)), "source-frame-value-update-highlight");
|
| - }
|
| - }
|
| - if (widgetChanged) {
|
| - this._valueWidgets.delete(i);
|
| - this.textEditor.removeDecoration(oldWidget, i);
|
| - }
|
| - }
|
| - if (widgetChanged) {
|
| - this._valueWidgets.set(i, widget);
|
| - this.textEditor.addDecoration(widget, i);
|
| - }
|
| - }
|
| - },
|
| -
|
| - clearExecutionLine: function()
|
| - {
|
| - if (this.loaded && this._executionLocation)
|
| - this.textEditor.clearExecutionLine();
|
| - delete this._executionLocation;
|
| - this._clearValueWidgetsTimer = setTimeout(this._clearValueWidgets.bind(this), 1000);
|
| - },
|
| -
|
| - _clearValueWidgets: function()
|
| - {
|
| - delete this._clearValueWidgetsTimer;
|
| - for (var line of this._valueWidgets.keys())
|
| - this.textEditor.removeDecoration(this._valueWidgets.get(line), line);
|
| - this._valueWidgets.clear();
|
| - },
|
| + /** @type {!Map.<number, !Set<string>>} */
|
| + var namesPerLine = new Map();
|
| + var skipObjectProperty = false;
|
| + var tokenizer = new WebInspector.CodeMirrorUtils.TokenizerFactory().createTokenizer('text/javascript');
|
| + tokenizer(this.textEditor.line(fromLine).substring(fromColumn), processToken.bind(this, fromLine));
|
| + for (var i = fromLine + 1; i < toLine; ++i)
|
| + tokenizer(this.textEditor.line(i), processToken.bind(this, i));
|
|
|
| /**
|
| - * @return {boolean}
|
| + * @param {number} lineNumber
|
| + * @param {string} tokenValue
|
| + * @param {?string} tokenType
|
| + * @param {number} column
|
| + * @param {number} newColumn
|
| + * @this {WebInspector.JavaScriptSourceFrame}
|
| */
|
| - _shouldIgnoreExternalBreakpointEvents: function()
|
| - {
|
| - if (this._supportsEnabledBreakpointsWhileEditing())
|
| - return false;
|
| - if (this._muted)
|
| - return true;
|
| - var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| - for (var i = 0; i < scriptFiles.length; ++i) {
|
| - if (scriptFiles[i].isDivergingFromVM() || scriptFiles[i].isMergingToVM())
|
| - return true;
|
| + function processToken(lineNumber, tokenValue, tokenType, column, newColumn) {
|
| + if (!skipObjectProperty && tokenType && this._isIdentifier(tokenType) && valuesMap.get(tokenValue)) {
|
| + var names = namesPerLine.get(lineNumber);
|
| + if (!names) {
|
| + names = new Set();
|
| + namesPerLine.set(lineNumber, names);
|
| }
|
| - return false;
|
| - },
|
| -
|
| - _breakpointAdded: function(event)
|
| - {
|
| - var uiLocation = /** @type {!WebInspector.UILocation} */ (event.data.uiLocation);
|
| - if (uiLocation.uiSourceCode !== this.uiSourceCode())
|
| - return;
|
| - if (this._shouldIgnoreExternalBreakpointEvents())
|
| - return;
|
| -
|
| - var breakpoint = /** @type {!WebInspector.BreakpointManager.Breakpoint} */ (event.data.breakpoint);
|
| - if (this.loaded)
|
| - this._addBreakpointDecoration(uiLocation.lineNumber, uiLocation.columnNumber, breakpoint.condition(), breakpoint.enabled(), false);
|
| - },
|
| -
|
| - _breakpointRemoved: function(event)
|
| - {
|
| - var uiLocation = /** @type {!WebInspector.UILocation} */ (event.data.uiLocation);
|
| - if (uiLocation.uiSourceCode !== this.uiSourceCode())
|
| - return;
|
| - if (this._shouldIgnoreExternalBreakpointEvents())
|
| - return;
|
| -
|
| - var remainingBreakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), uiLocation.lineNumber);
|
| - if (!remainingBreakpoint && this.loaded)
|
| - this._removeBreakpointDecoration(uiLocation.lineNumber);
|
| - },
|
| -
|
| - /**
|
| - * @param {!WebInspector.Event} event
|
| - */
|
| - _onSourceMappingChanged: function(event)
|
| - {
|
| - var data = /** @type {{target: !WebInspector.Target}} */ (event.data);
|
| - this._updateScriptFile(data.target);
|
| - this._updateLinesWithoutMappingHighlight();
|
| - },
|
| -
|
| - _updateLinesWithoutMappingHighlight: function()
|
| - {
|
| - var linesCount = this.textEditor.linesCount;
|
| - for (var i = 0; i < linesCount; ++i) {
|
| - var lineHasMapping = WebInspector.debuggerWorkspaceBinding.uiLineHasMapping(this.uiSourceCode(), i);
|
| - if (!lineHasMapping)
|
| - this._hasLineWithoutMapping = true;
|
| - if (this._hasLineWithoutMapping)
|
| - this.textEditor.toggleLineClass(i, "cm-line-without-source-mapping", !lineHasMapping);
|
| + names.add(tokenValue);
|
| + }
|
| + skipObjectProperty = tokenValue === '.';
|
| + }
|
| + this.textEditor.operation(this._renderDecorations.bind(this, valuesMap, namesPerLine, fromLine, toLine));
|
| + }
|
| +
|
| + /**
|
| + * @param {!Map.<string,!WebInspector.RemoteObject>} valuesMap
|
| + * @param {!Map.<number, !Set<string>>} namesPerLine
|
| + * @param {number} fromLine
|
| + * @param {number} toLine
|
| + */
|
| + _renderDecorations(valuesMap, namesPerLine, fromLine, toLine) {
|
| + var formatter = new WebInspector.RemoteObjectPreviewFormatter();
|
| + for (var i = fromLine; i < toLine; ++i) {
|
| + var names = namesPerLine.get(i);
|
| + var oldWidget = this._valueWidgets.get(i);
|
| + if (!names) {
|
| + if (oldWidget) {
|
| + this._valueWidgets.delete(i);
|
| + this.textEditor.removeDecoration(oldWidget, i);
|
| }
|
| - },
|
| -
|
| - /**
|
| - * @param {!WebInspector.Target} target
|
| - */
|
| - _updateScriptFile: function(target)
|
| - {
|
| - var oldScriptFile = this._scriptFileForTarget.get(target);
|
| - var newScriptFile = WebInspector.debuggerWorkspaceBinding.scriptFile(this.uiSourceCode(), target);
|
| - this._scriptFileForTarget.remove(target);
|
| - if (oldScriptFile) {
|
| - oldScriptFile.removeEventListener(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._didMergeToVM, this);
|
| - oldScriptFile.removeEventListener(WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
|
| - if (this._muted && !this.uiSourceCode().isDirty())
|
| - this._restoreBreakpointsIfConsistentScripts();
|
| + continue;
|
| + }
|
| +
|
| + var widget = createElementWithClass('div', 'text-editor-value-decoration');
|
| + var base = this.textEditor.cursorPositionToCoordinates(i, 0);
|
| + var offset = this.textEditor.cursorPositionToCoordinates(i, this.textEditor.line(i).length);
|
| + var codeMirrorLinesLeftPadding = 4;
|
| + var left = offset.x - base.x + codeMirrorLinesLeftPadding;
|
| + widget.style.left = left + 'px';
|
| + widget.__nameToToken = new Map();
|
| +
|
| + var renderedNameCount = 0;
|
| + for (var name of names) {
|
| + if (renderedNameCount > 10)
|
| + break;
|
| + if (namesPerLine.get(i - 1) && namesPerLine.get(i - 1).has(name))
|
| + continue; // Only render name once in the given continuous block.
|
| + if (renderedNameCount)
|
| + widget.createTextChild(', ');
|
| + var nameValuePair = widget.createChild('span');
|
| + widget.__nameToToken.set(name, nameValuePair);
|
| + nameValuePair.createTextChild(name + ' = ');
|
| + var value = valuesMap.get(name);
|
| + var propertyCount = value.preview ? value.preview.properties.length : 0;
|
| + var entryCount = value.preview && value.preview.entries ? value.preview.entries.length : 0;
|
| + if (value.preview && propertyCount + entryCount < 10)
|
| + formatter.appendObjectPreview(nameValuePair, value.preview);
|
| + else
|
| + nameValuePair.appendChild(WebInspector.ObjectPropertiesSection.createValueElement(value, false));
|
| + ++renderedNameCount;
|
| + }
|
| +
|
| + var widgetChanged = true;
|
| + if (oldWidget) {
|
| + widgetChanged = false;
|
| + for (var name of widget.__nameToToken.keys()) {
|
| + var oldText = oldWidget.__nameToToken.get(name) ? oldWidget.__nameToToken.get(name).textContent : '';
|
| + var newText = widget.__nameToToken.get(name) ? widget.__nameToToken.get(name).textContent : '';
|
| + if (newText !== oldText) {
|
| + widgetChanged = true;
|
| + // value has changed, update it.
|
| + WebInspector.runCSSAnimationOnce(
|
| + /** @type {!Element} */ (widget.__nameToToken.get(name)), 'source-frame-value-update-highlight');
|
| + }
|
| }
|
| - if (newScriptFile)
|
| - this._scriptFileForTarget.set(target, newScriptFile);
|
| -
|
| - this._updateDivergedInfobar();
|
| -
|
| - if (newScriptFile) {
|
| - newScriptFile.addEventListener(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._didMergeToVM, this);
|
| - newScriptFile.addEventListener(WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
|
| - if (this.loaded)
|
| - newScriptFile.checkMapping();
|
| - if (newScriptFile.hasSourceMapURL()) {
|
| - var sourceMapInfobar = WebInspector.Infobar.create(WebInspector.Infobar.Type.Info, WebInspector.UIString("Source Map detected."), WebInspector.settings.createSetting("sourceMapInfobarDisabled", false));
|
| - if (sourceMapInfobar) {
|
| - sourceMapInfobar.createDetailsRowMessage(WebInspector.UIString("Associated files should be added to the file tree. You can debug these resolved source files as regular JavaScript files."));
|
| - sourceMapInfobar.createDetailsRowMessage(WebInspector.UIString("Associated files are available via file tree or %s.", WebInspector.shortcutRegistry.shortcutTitleForAction("sources.go-to-source")));
|
| - this.attachInfobars([sourceMapInfobar]);
|
| - }
|
| - }
|
| + if (widgetChanged) {
|
| + this._valueWidgets.delete(i);
|
| + this.textEditor.removeDecoration(oldWidget, i);
|
| }
|
| - },
|
| -
|
| - /**
|
| - * @override
|
| - */
|
| - onTextEditorContentSet: function()
|
| - {
|
| - WebInspector.UISourceCodeFrame.prototype.onTextEditorContentSet.call(this);
|
| - if (this._executionLocation)
|
| - this.setExecutionLocation(this._executionLocation);
|
| -
|
| - var breakpointLocations = this._breakpointManager.breakpointLocationsForUISourceCode(this.uiSourceCode());
|
| - for (var i = 0; i < breakpointLocations.length; ++i)
|
| - this._breakpointAdded({data:breakpointLocations[i]});
|
| -
|
| - var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| - for (var i = 0; i < scriptFiles.length; ++i)
|
| - scriptFiles[i].checkMapping();
|
| -
|
| - this._updateLinesWithoutMappingHighlight();
|
| - this._detectMinified();
|
| - },
|
| -
|
| - _detectMinified: function()
|
| - {
|
| - if (this._prettyPrintInfobar)
|
| - return;
|
| -
|
| - var minified = false;
|
| - for (var i = 0; i < 10 && i < this.textEditor.linesCount; ++i) {
|
| - var line = this.textEditor.line(i);
|
| - if (line.startsWith("//#")) // mind source map.
|
| - continue;
|
| - if (line.length > 500) {
|
| - minified = true;
|
| - break;
|
| - }
|
| + }
|
| + if (widgetChanged) {
|
| + this._valueWidgets.set(i, widget);
|
| + this.textEditor.addDecoration(widget, i);
|
| + }
|
| + }
|
| + }
|
| +
|
| + clearExecutionLine() {
|
| + if (this.loaded && this._executionLocation)
|
| + this.textEditor.clearExecutionLine();
|
| + delete this._executionLocation;
|
| + this._clearValueWidgetsTimer = setTimeout(this._clearValueWidgets.bind(this), 1000);
|
| + }
|
| +
|
| + _clearValueWidgets() {
|
| + delete this._clearValueWidgetsTimer;
|
| + for (var line of this._valueWidgets.keys())
|
| + this.textEditor.removeDecoration(this._valueWidgets.get(line), line);
|
| + this._valueWidgets.clear();
|
| + }
|
| +
|
| + /**
|
| + * @return {boolean}
|
| + */
|
| + _shouldIgnoreExternalBreakpointEvents() {
|
| + if (this._supportsEnabledBreakpointsWhileEditing())
|
| + return false;
|
| + if (this._muted)
|
| + return true;
|
| + var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| + for (var i = 0; i < scriptFiles.length; ++i) {
|
| + if (scriptFiles[i].isDivergingFromVM() || scriptFiles[i].isMergingToVM())
|
| + return true;
|
| + }
|
| + return false;
|
| + }
|
| +
|
| + _breakpointAdded(event) {
|
| + var uiLocation = /** @type {!WebInspector.UILocation} */ (event.data.uiLocation);
|
| + if (uiLocation.uiSourceCode !== this.uiSourceCode())
|
| + return;
|
| + if (this._shouldIgnoreExternalBreakpointEvents())
|
| + return;
|
| +
|
| + var breakpoint = /** @type {!WebInspector.BreakpointManager.Breakpoint} */ (event.data.breakpoint);
|
| + if (this.loaded)
|
| + this._addBreakpointDecoration(
|
| + uiLocation.lineNumber, uiLocation.columnNumber, breakpoint.condition(), breakpoint.enabled(), false);
|
| + }
|
| +
|
| + _breakpointRemoved(event) {
|
| + var uiLocation = /** @type {!WebInspector.UILocation} */ (event.data.uiLocation);
|
| + if (uiLocation.uiSourceCode !== this.uiSourceCode())
|
| + return;
|
| + if (this._shouldIgnoreExternalBreakpointEvents())
|
| + return;
|
| +
|
| + var remainingBreakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), uiLocation.lineNumber);
|
| + if (!remainingBreakpoint && this.loaded)
|
| + this._removeBreakpointDecoration(uiLocation.lineNumber);
|
| + }
|
| +
|
| + /**
|
| + * @param {!WebInspector.Event} event
|
| + */
|
| + _onSourceMappingChanged(event) {
|
| + var data = /** @type {{target: !WebInspector.Target}} */ (event.data);
|
| + this._updateScriptFile(data.target);
|
| + this._updateLinesWithoutMappingHighlight();
|
| + }
|
| +
|
| + _updateLinesWithoutMappingHighlight() {
|
| + var linesCount = this.textEditor.linesCount;
|
| + for (var i = 0; i < linesCount; ++i) {
|
| + var lineHasMapping = WebInspector.debuggerWorkspaceBinding.uiLineHasMapping(this.uiSourceCode(), i);
|
| + if (!lineHasMapping)
|
| + this._hasLineWithoutMapping = true;
|
| + if (this._hasLineWithoutMapping)
|
| + this.textEditor.toggleLineClass(i, 'cm-line-without-source-mapping', !lineHasMapping);
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * @param {!WebInspector.Target} target
|
| + */
|
| + _updateScriptFile(target) {
|
| + var oldScriptFile = this._scriptFileForTarget.get(target);
|
| + var newScriptFile = WebInspector.debuggerWorkspaceBinding.scriptFile(this.uiSourceCode(), target);
|
| + this._scriptFileForTarget.remove(target);
|
| + if (oldScriptFile) {
|
| + oldScriptFile.removeEventListener(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._didMergeToVM, this);
|
| + oldScriptFile.removeEventListener(
|
| + WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
|
| + if (this._muted && !this.uiSourceCode().isDirty())
|
| + this._restoreBreakpointsIfConsistentScripts();
|
| + }
|
| + if (newScriptFile)
|
| + this._scriptFileForTarget.set(target, newScriptFile);
|
| +
|
| + this._updateDivergedInfobar();
|
| +
|
| + if (newScriptFile) {
|
| + newScriptFile.addEventListener(WebInspector.ResourceScriptFile.Events.DidMergeToVM, this._didMergeToVM, this);
|
| + newScriptFile.addEventListener(
|
| + WebInspector.ResourceScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
|
| + if (this.loaded)
|
| + newScriptFile.checkMapping();
|
| + if (newScriptFile.hasSourceMapURL()) {
|
| + var sourceMapInfobar = WebInspector.Infobar.create(
|
| + WebInspector.Infobar.Type.Info, WebInspector.UIString('Source Map detected.'),
|
| + WebInspector.settings.createSetting('sourceMapInfobarDisabled', false));
|
| + if (sourceMapInfobar) {
|
| + sourceMapInfobar.createDetailsRowMessage(WebInspector.UIString(
|
| + 'Associated files should be added to the file tree. You can debug these resolved source files as regular JavaScript files.'));
|
| + sourceMapInfobar.createDetailsRowMessage(WebInspector.UIString(
|
| + 'Associated files are available via file tree or %s.',
|
| + WebInspector.shortcutRegistry.shortcutTitleForAction('sources.go-to-source')));
|
| + this.attachInfobars([sourceMapInfobar]);
|
| }
|
| - if (!minified)
|
| - return;
|
| -
|
| - this._prettyPrintInfobar = WebInspector.Infobar.create(
|
| - WebInspector.Infobar.Type.Info,
|
| - WebInspector.UIString("Pretty-print this minified file?"),
|
| - WebInspector.settings.createSetting("prettyPrintInfobarDisabled", false));
|
| - if (!this._prettyPrintInfobar)
|
| - return;
|
| -
|
| - this._prettyPrintInfobar.setCloseCallback(() => delete this._prettyPrintInfobar);
|
| - var toolbar = new WebInspector.Toolbar("");
|
| - var button = new WebInspector.ToolbarButton("", "format-toolbar-item");
|
| - toolbar.appendToolbarItem(button);
|
| - toolbar.element.style.display = "inline-block";
|
| - toolbar.element.style.verticalAlign = "middle";
|
| - toolbar.element.style.marginBottom = "3px";
|
| - toolbar.element.style.pointerEvents = "none";
|
| - var element = this._prettyPrintInfobar.createDetailsRowMessage();
|
| - element.appendChild(WebInspector.formatLocalized("You can click the %s button on the bottom status bar, and continue debugging with the new formatted source.", [toolbar.element]));
|
| - this.attachInfobars([this._prettyPrintInfobar]);
|
| - },
|
| -
|
| - /**
|
| - * @param {!WebInspector.Event} event
|
| - */
|
| - _handleGutterClick: function(event)
|
| - {
|
| - if (this._muted)
|
| - return;
|
| -
|
| - var eventData = /** @type {!WebInspector.SourcesTextEditor.GutterClickEventData} */ (event.data);
|
| - var lineNumber = eventData.lineNumber;
|
| - var eventObject = eventData.event;
|
| -
|
| - if (eventObject.button !== 0 || eventObject.altKey || eventObject.ctrlKey || eventObject.metaKey)
|
| - return;
|
| -
|
| - this._toggleBreakpoint(lineNumber, eventObject.shiftKey);
|
| - eventObject.consume(true);
|
| - },
|
| -
|
| - /**
|
| - * @param {number} lineNumber
|
| - * @param {boolean} onlyDisable
|
| - */
|
| - _toggleBreakpoint: function(lineNumber, onlyDisable)
|
| - {
|
| - var breakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), lineNumber);
|
| - if (breakpoint) {
|
| - if (onlyDisable)
|
| - breakpoint.setEnabled(!breakpoint.enabled());
|
| - else
|
| - breakpoint.remove();
|
| - } else
|
| - this._createNewBreakpoint(lineNumber, 0, "", true);
|
| - },
|
| -
|
| - /**
|
| - * @param {number} lineNumber
|
| - * @param {number} columnNumber
|
| - * @param {string} condition
|
| - * @param {boolean} enabled
|
| - */
|
| - _createNewBreakpoint: function(lineNumber, columnNumber, condition, enabled)
|
| - {
|
| - this._setBreakpoint(lineNumber, columnNumber, condition, enabled);
|
| - WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.ScriptsBreakpointSet);
|
| - },
|
| -
|
| - toggleBreakpointOnCurrentLine: function()
|
| - {
|
| - if (this._muted)
|
| - return;
|
| -
|
| - var selection = this.textEditor.selection();
|
| - if (!selection)
|
| - return;
|
| - this._toggleBreakpoint(selection.startLine, false);
|
| - },
|
| -
|
| - /**
|
| - * @param {number} lineNumber
|
| - * @param {number} columnNumber
|
| - * @param {string} condition
|
| - * @param {boolean} enabled
|
| - */
|
| - _setBreakpoint: function(lineNumber, columnNumber, condition, enabled)
|
| - {
|
| - if (!WebInspector.debuggerWorkspaceBinding.uiLineHasMapping(this.uiSourceCode(), lineNumber))
|
| - return;
|
| -
|
| - this._breakpointManager.setBreakpoint(this.uiSourceCode(), lineNumber, columnNumber, condition, enabled);
|
| - },
|
| -
|
| - dispose: function()
|
| - {
|
| - this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
|
| - this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
|
| - this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
|
| - this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
|
| - this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
|
| - this.uiSourceCode().removeEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
|
| - WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| - WebInspector.moduleSetting("skipContentScripts").removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| - WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
|
| - },
|
| -
|
| - __proto__: WebInspector.UISourceCodeFrame.prototype
|
| + }
|
| + }
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + onTextEditorContentSet() {
|
| + super.onTextEditorContentSet();
|
| + if (this._executionLocation)
|
| + this.setExecutionLocation(this._executionLocation);
|
| +
|
| + var breakpointLocations = this._breakpointManager.breakpointLocationsForUISourceCode(this.uiSourceCode());
|
| + for (var i = 0; i < breakpointLocations.length; ++i)
|
| + this._breakpointAdded({data: breakpointLocations[i]});
|
| +
|
| + var scriptFiles = this._scriptFileForTarget.valuesArray();
|
| + for (var i = 0; i < scriptFiles.length; ++i)
|
| + scriptFiles[i].checkMapping();
|
| +
|
| + this._updateLinesWithoutMappingHighlight();
|
| + this._detectMinified();
|
| + }
|
| +
|
| + _detectMinified() {
|
| + if (this._prettyPrintInfobar)
|
| + return;
|
| +
|
| + var minified = false;
|
| + for (var i = 0; i < 10 && i < this.textEditor.linesCount; ++i) {
|
| + var line = this.textEditor.line(i);
|
| + if (line.startsWith('//#')) // mind source map.
|
| + continue;
|
| + if (line.length > 500) {
|
| + minified = true;
|
| + break;
|
| + }
|
| + }
|
| + if (!minified)
|
| + return;
|
| +
|
| + this._prettyPrintInfobar = WebInspector.Infobar.create(
|
| + WebInspector.Infobar.Type.Info, WebInspector.UIString('Pretty-print this minified file?'),
|
| + WebInspector.settings.createSetting('prettyPrintInfobarDisabled', false));
|
| + if (!this._prettyPrintInfobar)
|
| + return;
|
| +
|
| + this._prettyPrintInfobar.setCloseCallback(() => delete this._prettyPrintInfobar);
|
| + var toolbar = new WebInspector.Toolbar('');
|
| + var button = new WebInspector.ToolbarButton('', 'format-toolbar-item');
|
| + toolbar.appendToolbarItem(button);
|
| + toolbar.element.style.display = 'inline-block';
|
| + toolbar.element.style.verticalAlign = 'middle';
|
| + toolbar.element.style.marginBottom = '3px';
|
| + toolbar.element.style.pointerEvents = 'none';
|
| + var element = this._prettyPrintInfobar.createDetailsRowMessage();
|
| + element.appendChild(WebInspector.formatLocalized(
|
| + 'You can click the %s button on the bottom status bar, and continue debugging with the new formatted source.',
|
| + [toolbar.element]));
|
| + this.attachInfobars([this._prettyPrintInfobar]);
|
| + }
|
| +
|
| + /**
|
| + * @param {!WebInspector.Event} event
|
| + */
|
| + _handleGutterClick(event) {
|
| + if (this._muted)
|
| + return;
|
| +
|
| + var eventData = /** @type {!WebInspector.SourcesTextEditor.GutterClickEventData} */ (event.data);
|
| + var lineNumber = eventData.lineNumber;
|
| + var eventObject = eventData.event;
|
| +
|
| + if (eventObject.button !== 0 || eventObject.altKey || eventObject.ctrlKey || eventObject.metaKey)
|
| + return;
|
| +
|
| + this._toggleBreakpoint(lineNumber, eventObject.shiftKey);
|
| + eventObject.consume(true);
|
| + }
|
| +
|
| + /**
|
| + * @param {number} lineNumber
|
| + * @param {boolean} onlyDisable
|
| + */
|
| + _toggleBreakpoint(lineNumber, onlyDisable) {
|
| + var breakpoint = this._breakpointManager.findBreakpointOnLine(this.uiSourceCode(), lineNumber);
|
| + if (breakpoint) {
|
| + if (onlyDisable)
|
| + breakpoint.setEnabled(!breakpoint.enabled());
|
| + else
|
| + breakpoint.remove();
|
| + } else
|
| + this._createNewBreakpoint(lineNumber, 0, '', true);
|
| + }
|
| +
|
| + /**
|
| + * @param {number} lineNumber
|
| + * @param {number} columnNumber
|
| + * @param {string} condition
|
| + * @param {boolean} enabled
|
| + */
|
| + _createNewBreakpoint(lineNumber, columnNumber, condition, enabled) {
|
| + this._setBreakpoint(lineNumber, columnNumber, condition, enabled);
|
| + WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.ScriptsBreakpointSet);
|
| + }
|
| +
|
| + toggleBreakpointOnCurrentLine() {
|
| + if (this._muted)
|
| + return;
|
| +
|
| + var selection = this.textEditor.selection();
|
| + if (!selection)
|
| + return;
|
| + this._toggleBreakpoint(selection.startLine, false);
|
| + }
|
| +
|
| + /**
|
| + * @param {number} lineNumber
|
| + * @param {number} columnNumber
|
| + * @param {string} condition
|
| + * @param {boolean} enabled
|
| + */
|
| + _setBreakpoint(lineNumber, columnNumber, condition, enabled) {
|
| + if (!WebInspector.debuggerWorkspaceBinding.uiLineHasMapping(this.uiSourceCode(), lineNumber))
|
| + return;
|
| +
|
| + this._breakpointManager.setBreakpoint(this.uiSourceCode(), lineNumber, columnNumber, condition, enabled);
|
| + }
|
| +
|
| + /**
|
| + * @override
|
| + */
|
| + dispose() {
|
| + this._breakpointManager.removeEventListener(
|
| + WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
|
| + this._breakpointManager.removeEventListener(
|
| + WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
|
| + this.uiSourceCode().removeEventListener(
|
| + WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
|
| + this.uiSourceCode().removeEventListener(
|
| + WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
|
| + this.uiSourceCode().removeEventListener(
|
| + WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
|
| + this.uiSourceCode().removeEventListener(
|
| + WebInspector.UISourceCode.Events.TitleChanged, this._showBlackboxInfobarIfNeeded, this);
|
| + WebInspector.moduleSetting('skipStackFramesPattern').removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| + WebInspector.moduleSetting('skipContentScripts').removeChangeListener(this._showBlackboxInfobarIfNeeded, this);
|
| + super.dispose();
|
| + }
|
| };
|
|
|
Chromium Code Reviews
Issue 2466123002:
DevTools: reformat front-end code to match chromium style. (Closed)
