diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/devtools')
24 files changed, 111 insertions, 1289 deletions
diff --git a/chromium/third_party/WebKit/Source/devtools/devtools.gyp b/chromium/third_party/WebKit/Source/devtools/devtools.gyp index b458f6e9b58..1eb4103cfc1 100644 --- a/chromium/third_party/WebKit/Source/devtools/devtools.gyp +++ b/chromium/third_party/WebKit/Source/devtools/devtools.gyp @@ -105,7 +105,6 @@ 'front_end/JavaScriptFormatter.js', 'front_end/jsdifflib.js', 'front_end/KeyboardShortcut.js', - 'front_end/LayersPanelDescriptor.js', 'front_end/Linkifier.js', 'front_end/LiveEditSupport.js', 'front_end/NativeBreakpointsSidebarPane.js', @@ -232,7 +231,6 @@ 'front_end/textPrompt.css', 'front_end/timelinePanel.css', 'front_end/canvasProfiler.css', - 'front_end/layersPanel.css', ], 'devtools_elements_js_files': [ 'front_end/CSSNamedFlowCollectionsView.js', @@ -352,7 +350,6 @@ '<@(devtools_timeline_js_files)', '<@(devtools_profiles_js_files)', '<@(devtools_audits_js_files)', - '<@(devtools_layers_js_files)', '<@(devtools_codemirror_js_files)', ], 'devtools_uglifyjs_files': [ @@ -460,14 +457,6 @@ 'front_end/Images/trackHoriz.png', 'front_end/Images/trackVert.png', ], - - 'devtools_layers_js_files': [ - 'front_end/LayersPanel.js', - 'front_end/LayerTreeModel.js', - 'front_end/LayerTree.js', - 'front_end/Layers3DView.js', - ], - 'devtools_extension_api_files': [ 'front_end/ExtensionAPI.js', 'front_end/DevToolsExtensionAPI.js' @@ -492,7 +481,6 @@ 'concatenated_devtools_profiles_js', 'concatenated_devtools_audits_js', 'concatenated_devtools_codemirror_js', - 'concatenated_devtools_layers_js', 'concatenated_heap_snapshot_worker_js', 'concatenated_script_formatter_worker_js', 'concatenated_devtools_css'], @@ -578,7 +566,6 @@ 'concatenated_devtools_profiles_js', 'concatenated_devtools_audits_js', 'concatenated_devtools_codemirror_js', - 'concatenated_devtools_layers_js', 'concatenated_heap_snapshot_worker_js', 'concatenated_script_formatter_worker_js', 'concatenated_devtools_css'], @@ -595,7 +582,6 @@ '<(PRODUCT_DIR)/resources/inspector/TimelinePanel.js', '<(PRODUCT_DIR)/resources/inspector/ProfilesPanel.js', '<(PRODUCT_DIR)/resources/inspector/AuditsPanel.js', - '<(PRODUCT_DIR)/resources/inspector/LayersPanel.js', '<(PRODUCT_DIR)/resources/inspector/CodeMirrorTextEditor.js', '<(PRODUCT_DIR)/resources/inspector/HeapSnapshotWorker.js', '<(PRODUCT_DIR)/resources/inspector/ScriptFormatterWorker.js', @@ -871,22 +857,6 @@ }], }, { - 'target_name': 'concatenated_devtools_layers_js', - 'type': 'none', - 'actions': [{ - 'action_name': 'concatenate_devtools_layers_js', - 'script_name': 'scripts/inline_js_imports.py', - 'input_file': 'front_end/LayersPanel.js', - 'inputs': [ - '<@(_script_name)', - '<@(devtools_layers_js_files)', - ], - 'search_path': 'front_end', - 'outputs': ['<(PRODUCT_DIR)/resources/inspector/LayersPanel.js'], - 'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_search_path)', '<@(_outputs)'], - }], - }, - { 'target_name': 'concatenated_devtools_css', 'type': 'none', 'dependencies': [ diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/AuditLauncherView.js b/chromium/third_party/WebKit/Source/devtools/front_end/AuditLauncherView.js index 3ff4e4e9930..b5f777e5295 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/AuditLauncherView.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/AuditLauncherView.js @@ -141,7 +141,7 @@ WebInspector.AuditLauncherView.prototype = { if (this._auditRunning === auditRunning) return; this._auditRunning = auditRunning; - this._launchButton.textContent = this._auditRunning ? WebInspector.UIString("Stop") : WebInspector.UIString("Run"); + this._updateButton(); this._toggleUIComponents(this._auditRunning); if (this._auditRunning) this._startAudit(); @@ -208,6 +208,17 @@ WebInspector.AuditLauncherView.prototype = { _categoryClicked: function() { this._selectedCategoriesUpdated(true); + this._selectAllCheckboxElement.checked = this._checkedCategoriesCount === this._sortedCategories.length; + }, + + _updateCheckedCategoriesCount: function() + { + this._checkedCategoriesCount = 0; + var checkboxes = this._categoriesElement.getElementsByTagName("input"); + for (var i = 0; i < checkboxes.length; ++i) { + if (checkboxes[i].checked) + this._checkedCategoriesCount += 1; + } }, /** @@ -252,6 +263,7 @@ WebInspector.AuditLauncherView.prototype = { this._contentElement.appendChild(categoryElement); this._categoriesElement = this._contentElement.createChild("fieldset", "audit-categories-container"); + this._checkedCategoriesCount = 0; this._contentElement.createChild("div", "flexible-space"); @@ -289,14 +301,7 @@ WebInspector.AuditLauncherView.prototype = { */ _selectedCategoriesUpdated: function(userGesture) { - var checkedCategoriesCount = 0; - var checkboxes = this._categoriesElement.getElementsByTagName("input"); - for (var i = 0; i < checkboxes.length; ++i) { - if (checkboxes[i].checked) - ++checkedCategoriesCount; - } - this._launchButton.disabled = checkedCategoriesCount === 0; - this._selectAllCheckboxElement.checked = checkedCategoriesCount === this._sortedCategories.length; + this._updateCheckedCategoriesCount(); // Save present categories only upon user gesture to clean up junk from past versions and removed extensions. // Do not remove old categories if not handling a user gesture, as there's chance categories will be added @@ -307,6 +312,13 @@ WebInspector.AuditLauncherView.prototype = { selectedCategories[childNodes[i].__displayName] = childNodes[i].firstChild.checked; selectedCategories[WebInspector.AuditLauncherView.AllCategoriesKey] = this._selectAllCheckboxElement.checked; this._selectedCategoriesSetting.set(selectedCategories); + this._updateButton(); + }, + + _updateButton: function() + { + this._launchButton.textContent = this._auditRunning ? WebInspector.UIString("Stop") : WebInspector.UIString("Run"); + this._launchButton.disabled = !this._checkedCategoriesCount; }, __proto__: WebInspector.View.prototype diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/CPUProfileView.js b/chromium/third_party/WebKit/Source/devtools/front_end/CPUProfileView.js index 3a3153bf75a..ff9a152531c 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/CPUProfileView.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/CPUProfileView.js @@ -143,6 +143,9 @@ WebInspector.CPUProfileView.prototype = { this._calculateTimes(profile); + if (profile.idleTime) + this._injectIdleTimeNode(profile); + this._assignParentsInProfile(); if (this.samples) this._buildIdToNodeMap(); @@ -628,6 +631,39 @@ WebInspector.CPUProfileView.prototype = { } }, + /** + * @param {ProfilerAgent.CPUProfile} profile + */ + _injectIdleTimeNode: function(profile) + { + var idleTime = profile.idleTime; + var nodes = profile.head.children; + + var programNode = {selfTime: 0}; + for (var i = nodes.length - 1; i >= 0; --i) { + if (nodes[i].functionName === "(program)") { + programNode = nodes[i]; + break; + } + } + var programTime = programNode.selfTime; + if (idleTime > programTime) + idleTime = programTime; + programTime = programTime - idleTime; + programNode.selfTime = programTime; + programNode.totalTime = programTime; + var idleNode = { + functionName: "(idle)", + url: null, + lineNumber: 0, + totalTime: idleTime, + selfTime: idleTime, + callUID: 0, + children: [] + }; + nodes.push(idleNode); + }, + __proto__: WebInspector.View.prototype } diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/CanvasProfileView.js b/chromium/third_party/WebKit/Source/devtools/front_end/CanvasProfileView.js index 76094be452a..02e7b4d01a6 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/CanvasProfileView.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/CanvasProfileView.js @@ -484,13 +484,12 @@ WebInspector.CanvasProfileView.prototype = { { var element = parentElement.createChild("span", "canvas-call-argument"); element._argumentIndex = -1; - var description = callArgument.enumName || callArgument.description; if (callArgument.type === "string") { const maxStringLength = 150; element.createTextChild("\""); - element.createChild("span", "canvas-formatted-string").textContent = description.trimMiddle(maxStringLength); + element.createChild("span", "canvas-formatted-string").textContent = callArgument.description.trimMiddle(maxStringLength); element.createTextChild("\""); - element._suppressPopover = (description.length <= maxStringLength && !/[\r\n]/.test(description)); + element._suppressPopover = (callArgument.description.length <= maxStringLength && !/[\r\n]/.test(callArgument.description)); } else { var type = callArgument.subtype || callArgument.type; if (type) { @@ -502,11 +501,11 @@ WebInspector.CanvasProfileView.prototype = { element._suppressPopover = true; break; case "number": - element._suppressPopover = !isNaN(description); + element._suppressPopover = !isNaN(callArgument.description); break; } } - element.textContent = description; + element.textContent = callArgument.description; } if (callArgument.resourceId) { element.addStyleClass("canvas-formatted-resource"); diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/CodeMirrorTextEditor.js b/chromium/third_party/WebKit/Source/devtools/front_end/CodeMirrorTextEditor.js index 029f07fe4a4..fa7c6d4323f 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/CodeMirrorTextEditor.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/CodeMirrorTextEditor.js @@ -856,10 +856,6 @@ WebInspector.CodeMirrorTextEditor.prototype = { { }, - /** - * @param {number} width - * @param {number} height - */ _updatePaddingBottom: function(width, height) { var scrollInfo = this._codeMirror.getScrollInfo(); @@ -877,12 +873,9 @@ WebInspector.CodeMirrorTextEditor.prototype = { _resizeEditor: function() { - var parentElement = this.element.parentElement; - if (!parentElement || !this.isShowing()) - return; var scrollInfo = this._codeMirror.getScrollInfo(); - var width = parentElement.offsetWidth; - var height = parentElement.offsetHeight; + var width = this.element.parentElement.offsetWidth; + var height = this.element.parentElement.offsetHeight; this._codeMirror.setSize(width, height); this._updatePaddingBottom(width, height); this._codeMirror.scrollTo(scrollInfo.left, scrollInfo.top); diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/DebuggerModel.js b/chromium/third_party/WebKit/Source/devtools/front_end/DebuggerModel.js index da464fbe3c0..cffad006043 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/DebuggerModel.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/DebuggerModel.js @@ -167,24 +167,6 @@ WebInspector.DebuggerModel.prototype = { /** * @param {WebInspector.DebuggerModel.Location} rawLocation - */ - stepIntoSelection: function(rawLocation) - { - /** - * @param {WebInspector.DebuggerModel.Location} requestedLocation - * @param {?string} error - */ - function callback(requestedLocation, error) - { - if (error) - return; - this._pendingStepIntoLocation = requestedLocation; - }; - DebuggerAgent.continueToLocation(rawLocation, true, callback.bind(this, rawLocation)); - }, - - /** - * @param {WebInspector.DebuggerModel.Location} rawLocation * @param {string} condition * @param {function(?DebuggerAgent.BreakpointId, Array.<WebInspector.DebuggerModel.Location>):void=} callback */ @@ -383,19 +365,6 @@ WebInspector.DebuggerModel.prototype = { */ _pausedScript: function(callFrames, reason, auxData, breakpointIds) { - if (this._pendingStepIntoLocation) { - var requestedLocation = this._pendingStepIntoLocation; - delete this._pendingStepIntoLocation; - - if (callFrames.length > 0) { - var topLocation = callFrames[0].location; - if (topLocation.lineNumber == requestedLocation.lineNumber && topLocation.columnNumber == requestedLocation.columnNumber && topLocation.scriptId == requestedLocation.scriptId) { - DebuggerAgent.stepInto(); - return; - } - } - } - this._setDebuggerPausedDetails(new WebInspector.DebuggerPausedDetails(this, callFrames, reason, auxData, breakpointIds)); }, @@ -505,11 +474,7 @@ WebInspector.DebuggerModel.prototype = { function updateExecutionLine(uiLocation) { - var data = { - uiLocation: uiLocation, - callFrame: callFrame - }; - this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ExecutionLineChanged, data); + this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.ExecutionLineChanged, uiLocation); } this._executionLineLiveLocation = callFrame.script.createLiveLocation(callFrame.location, updateExecutionLine.bind(this)); }, @@ -849,29 +814,6 @@ WebInspector.DebuggerModel.CallFrame.prototype = { }, /** - * @param {function(Array.<DebuggerAgent.Location>)} callback - */ - getStepIntoLocations: function(callback) - { - if (this._stepInLocations) { - callback(this._stepInLocations.slice(0)); - return; - } - /** - * @param {?string} error - * @param {Array.<DebuggerAgent.Location>=} stepInPositions - */ - function getStepInPositionsCallback(error, stepInPositions) { - if (error) { - return; - } - this._stepInLocations = stepInPositions; - callback(this._stepInLocations.slice(0)); - } - DebuggerAgent.getStepInPositions(this.id, getStepInPositionsCallback.bind(this)); - }, - - /** * @param {function(WebInspector.UILocation):(boolean|undefined)} updateDelegate */ createLiveLocation: function(updateDelegate) diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/JavaScriptSourceFrame.js b/chromium/third_party/WebKit/Source/devtools/front_end/JavaScriptSourceFrame.js index c35d6706a8d..e245d9e2683 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/JavaScriptSourceFrame.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/JavaScriptSourceFrame.js @@ -51,10 +51,6 @@ WebInspector.JavaScriptSourceFrame = function(scriptsPanel, uiSourceCode) this.textEditor.addEventListener(WebInspector.TextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this); - this.textEditor.element.addEventListener("mousedown", this._onMouseDownAndClick.bind(this, true), true); - this.textEditor.element.addEventListener("click", this._onMouseDownAndClick.bind(this, false), true); - - this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this); this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this); @@ -364,12 +360,6 @@ WebInspector.JavaScriptSourceFrame.prototype = { if (this._popoverHelper.isPopoverVisible()) { this._popoverHelper.hidePopover(); event.consume(); - return; - } - if (this._stepIntoMarkup && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) { - this._stepIntoMarkup.moveSelectionTo(-1); - event.consume(); - return; } } }, @@ -426,44 +416,23 @@ WebInspector.JavaScriptSourceFrame.prototype = { /** * @param {number} lineNumber - * @param {WebInspector.DebuggerModel.CallFrame} callFrame */ - setExecutionLine: function(lineNumber, callFrame) + setExecutionLine: function(lineNumber) { this._executionLineNumber = lineNumber; - this._executionCallFrame = callFrame; if (this.loaded) { this.textEditor.setExecutionLine(lineNumber); this.revealLine(this._executionLineNumber); if (this.canEditSource()) this.setSelection(WebInspector.TextRange.createFromLocation(lineNumber, 0)); - - /** - * @param {Array.<DebuggerAgent.Location>} locations - */ - function locationsCallback(locations) - { - if (this._executionCallFrame !== callFrame || this._stepIntoMarkup) - return; - this._stepIntoMarkup = WebInspector.JavaScriptSourceFrame.StepIntoMarkup.create(this, locations); - if (this._stepIntoMarkup) - this._stepIntoMarkup.show(); - } - callFrame.getStepIntoLocations(locationsCallback.bind(this)); } }, clearExecutionLine: function() { - if (this._stepIntoMarkup) { - this._stepIntoMarkup.dispose(); - delete this._stepIntoMarkup; - } - if (this.loaded && typeof this._executionLineNumber === "number") this.textEditor.clearExecutionLine(); delete this._executionLineNumber; - delete this._executionCallFrame; }, _lineNumberAfterEditing: function(lineNumber, oldRange, newRange) @@ -487,24 +456,6 @@ WebInspector.JavaScriptSourceFrame.prototype = { return newLineNumber; }, - _onMouseDownAndClick: function(isMouseDown, event) - { - var markup = this._stepIntoMarkup; - if (!markup) - return; - var index = markup.findItemByCoordinates(event.x, event.y); - if (typeof index === "undefined") - return; - - if (isMouseDown) { - // Do not let text editor to spoil 'click' event that is coming for us. - event.consume(); - } else { - var rawLocation = markup.getRawPosition(index); - this._scriptsPanel.doStepIntoSelection(rawLocation); - } - }, - /** * @return {boolean} */ @@ -592,7 +543,7 @@ WebInspector.JavaScriptSourceFrame.prototype = { onTextEditorContentLoaded: function() { if (typeof this._executionLineNumber === "number") - this.setExecutionLine(this._executionLineNumber, this._executionCallFrame); + this.setExecutionLine(this._executionLineNumber); var breakpointLocations = this._breakpointManager.breakpointLocationsForUISourceCode(this._uiSourceCode); for (var i = 0; i < breakpointLocations.length; ++i) @@ -680,14 +631,6 @@ WebInspector.JavaScriptSourceFrame.prototype = { WebInspector.debuggerModel.continueToLocation(rawLocation); }, - /** - * @return {WebInspector.JavaScriptSourceFrame.StepIntoMarkup|undefined} - */ - stepIntoMarkup: function() - { - return this._stepIntoMarkup; - }, - dispose: function() { this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this); @@ -703,178 +646,3 @@ WebInspector.JavaScriptSourceFrame.prototype = { __proto__: WebInspector.UISourceCodeFrame.prototype } - -/** - * @constructor - * @param {Array.<DebuggerAgent.Location>} rawPositions - * @param {Array.<WebInspector.TextRange>} editorRanges - * @param {number} firstToExecute - * @param {WebInspector.JavaScriptSourceFrame} sourceFrame - */ -WebInspector.JavaScriptSourceFrame.StepIntoMarkup = function(rawPositions, editorRanges, firstToExecute, sourceFrame) -{ - this._positions = rawPositions; - this._editorRanges = editorRanges; - this._highlightDescriptors = new Array(rawPositions.length); - this._firstToExecute = firstToExecute; - this._currentSelection = firstToExecute; - this._sourceFrame = sourceFrame; -}; - -WebInspector.JavaScriptSourceFrame.StepIntoMarkup.prototype = { - show: function() - { - for (var i = 0; i < this._positions.length; ++i) - this._highlightItem(i, i == this._currentSelection); - }, - - /** - * @param {boolean} backward - */ - iterateSelection: function(backward) - { - var nextSelection = backward ? this._currentSelection - 1 : this._currentSelection + 1; - this.moveSelectionTo(nextSelection); - }, - - selectFirstToExecute: function() - { - this.moveSelectionTo(this._firstToExecute); - }, - - /** - * @param {number} nextSelection - */ - moveSelectionTo: function(nextSelection) - { - var modulo = this._positions.length + 1; - nextSelection = (nextSelection + modulo) % modulo; - this._hideItemHighlight(this._currentSelection); - this._hideItemHighlight(nextSelection); - this._highlightItem(this._currentSelection, false); - this._highlightItem(nextSelection, true); - this._currentSelection = nextSelection; - }, - - /** - * @param {number} position - * @param {boolean} selected - */ - _highlightItem: function(position, selected) - { - if (position === this._positions.length) - return; - var styleName = selected ? "source-frame-stepin-mark-highlighted" : "source-frame-stepin-mark"; - var textEditor = this._sourceFrame.textEditor; - var highlightDescriptor = textEditor.highlightRange(this._editorRanges[position], styleName); - this._highlightDescriptors[position] = highlightDescriptor; - }, - - /** - * @param {number} position - */ - _hideItemHighlight: function(position) - { - if (position === this._positions.length) - return; - var highlightDescriptor = this._highlightDescriptors[position]; - console.assert(highlightDescriptor); - var textEditor = this._sourceFrame.textEditor; - textEditor.removeHighlight(highlightDescriptor); - this._highlightDescriptors[position] = undefined; - }, - - dispose: function() - { - for (var i = 0; i < this._positions.length; ++i) - this._hideItemHighlight(i); - }, - - /** - * @param {number} x - * @param {number} y - * @return {number|undefined} - */ - findItemByCoordinates: function(x, y) - { - var textPosition = this._sourceFrame.textEditor.coordinatesToCursorPosition(x, y); - if (!textPosition) - return; - - var ranges = this._editorRanges; - - for (var i = 0; i < ranges.length; ++i) { - var nextRange = ranges[i]; - if (nextRange.startLine == textPosition.startLine && nextRange.startColumn <= textPosition.startColumn && nextRange.endColumn >= textPosition.startColumn) - return i; - } - }, - - /** - * @return {number|undefined} - */ - getSelectedItemIndex: function() - { - if (this._currentSelection === this._positions.length) - return undefined; - return this._currentSelection; - }, - - /** - * @return {WebInspector.DebuggerModel.Location} - */ - getRawPosition: function(position) - { - return /** @type {WebInspector.DebuggerModel.Location} */ (this._positions[position]); - } - -}; - -/** - * @param {WebInspector.JavaScriptSourceFrame} sourceFrame - * @param {Array.<DebuggerAgent.Location>} stepIntoRawLocations - * @return {?WebInspector.JavaScriptSourceFrame.StepIntoMarkup} - */ -WebInspector.JavaScriptSourceFrame.StepIntoMarkup.create = function(sourceFrame, stepIntoRawLocations) -{ - if (!stepIntoRawLocations.length) - return null; - - var firstToExecute = stepIntoRawLocations[0]; - stepIntoRawLocations.sort(WebInspector.JavaScriptSourceFrame.StepIntoMarkup._Comparator); - var firstToExecuteIndex = stepIntoRawLocations.indexOf(firstToExecute); - - var textEditor = sourceFrame.textEditor; - var uiRanges = []; - for (var i = 0; i < stepIntoRawLocations.length; ++i) { - var uiLocation = WebInspector.debuggerModel.rawLocationToUILocation(/** @type {WebInspector.DebuggerModel.Location} */ (stepIntoRawLocations[i])); - - var token = textEditor.tokenAtTextPosition(uiLocation.lineNumber, uiLocation.columnNumber); - var startColumn; - var endColumn; - if (token) { - startColumn = token.startColumn; - endColumn = token.endColumn; - } else { - startColumn = uiLocation.columnNumber; - endColumn = uiLocation.columnNumber; - } - var range = new WebInspector.TextRange(uiLocation.lineNumber, startColumn, uiLocation.lineNumber, endColumn); - uiRanges.push(range); - } - - return new WebInspector.JavaScriptSourceFrame.StepIntoMarkup(stepIntoRawLocations, uiRanges, firstToExecuteIndex, sourceFrame); -}; - -/** - * @param {DebuggerAgent.Location} locationA - * @param {DebuggerAgent.Location} locationB - * @return {number} - */ -WebInspector.JavaScriptSourceFrame.StepIntoMarkup._Comparator = function(locationA, locationB) -{ - if (locationA.lineNumber === locationB.lineNumber) - return locationA.columnNumber - locationB.columnNumber; - else - return locationA.lineNumber - locationB.lineNumber; -}; diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/KeyboardShortcut.js b/chromium/third_party/WebKit/Source/devtools/front_end/KeyboardShortcut.js index 793c9bd56f3..b3f6f8fb110 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/KeyboardShortcut.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/KeyboardShortcut.js @@ -94,11 +94,6 @@ WebInspector.KeyboardShortcut.Keys = { H: { code: 72, name: "H" }, Ctrl: { code: 17, name: "Ctrl" }, Meta: { code: 91, name: "Meta" }, - get CtrlOrMeta() - { - // "default" command/ctrl key for platform, Command on Mac, Ctrl on other platforms - return WebInspector.isMac() ? this.Meta : this.Ctrl; - }, }; /** diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/LayerTree.js b/chromium/third_party/WebKit/Source/devtools/front_end/LayerTree.js deleted file mode 100644 index a525e6d5b99..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/LayerTree.js +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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 - * @param {WebInspector.LayerTreeModel} model - * @param {TreeOutline} treeOutline - */ -WebInspector.LayerTree = function(model, treeOutline) -{ - this._model = model; - this._treeOutline = treeOutline; - this._model.addEventListener(WebInspector.LayerTreeModel.Events.LayerTreeChanged, this._update.bind(this)); - this._needsUpdate = true; -} - -WebInspector.LayerTree.prototype = { - /** - * @param {boolean} visible - */ - setVisible: function(visible) - { - if (this._isVisible === visible) - return; - this._isVisible = visible; - if (visible && this._needsUpdate) - this._update(); - }, - - _update: function() - { - if (!this._isVisible) { - this._needsUpdate = true; - return; - } - this._needsUpdate = false; - - var seenLayers = {}; - - /** - * @param {WebInspector.Layer} layer - */ - function updateLayer(layer) - { - var id = layer.id(); - if (seenLayers[id]) - console.assert(false, "Duplicate layer id: " + id); - seenLayers[id] = true; - var node = this._treeOutline.getCachedTreeElement(layer); - var parent = layer.parent() ? this._treeOutline.getCachedTreeElement(layer.parent()) : this._treeOutline; - if (!parent) - console.assert(false, "Parent is not in the tree"); - if (!node) { - node = new WebInspector.LayerTreeElement(layer); - parent.appendChild(node); - } else { - var oldParentId = node.parent.representedObject && node.parent.representedObject.id(); - if (oldParentId !== layer.parentId()) { - (node.parent || this._treeOutline).removeChild(node); - parent.appendChild(node); - } - node._update(); - } - } - this._model.forEachLayer(updateLayer.bind(this)); - // Cleanup layers that don't exist anymore from tree - for (var i = 0; i < this._treeOutline.children.length; ++i) { - for (var node = this._treeOutline.children[i]; node;) { - if (seenLayers[node.representedObject.id()]) { - node = node.traverseNextTreeElement(false); - } else { - var nextNode = node.nextSibling || node.parent; - node.parent.removeChild(node); - node = nextNode; - } - } - } - } - } - -/** - * @constructor - * @param {WebInspector.Layer} layer - * @extends {TreeElement} - */ -WebInspector.LayerTreeElement = function(layer) -{ - TreeElement.call(this, "#" + layer.id(), layer); -} - -WebInspector.LayerTreeElement.prototype = { - onattach: function() - { - var selection = document.createElement("div"); - selection.className = "selection"; - this.listItemElement.insertBefore(selection, this.listItemElement.firstChild); - }, - - _update: function() - { - }, - - __proto__: TreeElement.prototype -} diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/LayerTreeModel.js b/chromium/third_party/WebKit/Source/devtools/front_end/LayerTreeModel.js deleted file mode 100644 index e4922bb1369..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/LayerTreeModel.js +++ /dev/null @@ -1,278 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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.Object} - */ -WebInspector.LayerTreeModel = function() -{ - this._layersById = {}; - InspectorBackend.registerLayerTreeDispatcher(new WebInspector.LayerTreeDispatcher(this)); - LayerTreeAgent.enable(); -} - -WebInspector.LayerTreeModel.Events = { - LayerTreeChanged: "LayerTreeChanged" -} - -WebInspector.LayerTreeModel.prototype = { - dispose: function() - { - LayerTreeAgent.disable(); - }, - - /** - * @return {WebInspector.Layer} - */ - root: function() - { - return this._root; - }, - - /** - * @param {function(WebInspector.Layer)} callback - * @param {WebInspector.Layer=} root - * @return {boolean} - */ - forEachLayer: function(callback, root) - { - if (!root) { - root = this.root(); - if (!root) - return false; - } - return callback(root) || root.children().some(this.forEachLayer.bind(this, callback)); - }, - - /** - * @param {function()=} callback - */ - requestLayers: function(callback) - { - if (!callback) - callback = function() {} - if (typeof this._root !== "undefined") { - callback(); - return; - } - if (this._pendingRequestLayersCallbacks) { - this._pendingRequestLayersCallbacks.push(callback); - return; - } - this._pendingRequestLayersCallbacks = []; - this._pendingRequestLayersCallbacks.push(callback); - function onGetLayers(error, layers) - { - this._root = null; - if (error) { - console.error("LayerTreeAgent.getLayers(): " + error); - return; - } - this._repopulate(layers); - for (var i = 0; i < this._pendingRequestLayersCallbacks.length; ++i) - this._pendingRequestLayersCallbacks[i](); - delete this._pendingRequestLayersCallbacks; - } - function onDocumentAvailable() - { - LayerTreeAgent.getLayers(undefined, onGetLayers.bind(this)) - } - WebInspector.domAgent.requestDocument(onDocumentAvailable.bind(this)); - }, - - /** - * @param {string} id - * @return {WebInspector.Layer?} - */ - layerById: function(id) - { - return this._layersById[id]; - }, - - /** - * @param{Array.<LayerTreeAgent.Layer>} payload - */ - _repopulate: function(payload) - { - var oldLayersById = this._layersById; - this._layersById = {}; - for (var i = 0; i < payload.length; ++i) { - var layer = oldLayersById[payload[i].layerId]; - if (layer) - layer._reset(payload[i]); - else - layer = new WebInspector.Layer(payload[i]); - this._layersById[layer.id()] = layer; - var parentId = layer.parentId(); - if (parentId) - this._layersById[parentId].addChild(layer); - else { - if (this._root) - console.assert(false, "Multiple root layers"); - this._root = layer; - } - } - this.dispatchEventToListeners(WebInspector.LayerTreeModel.Events.LayerTreeChanged); - }, - - _layerTreeChanged: function() - { - delete this._root; - this.requestLayers(); - }, - - __proto__: WebInspector.Object.prototype -} - -/** - * @constructor - * @param {LayerTreeAgent.Layer} layerPayload - */ -WebInspector.Layer = function(layerPayload) -{ - this._reset(layerPayload); -} - -WebInspector.Layer.prototype = { - /** - * @return {string?} - */ - id: function() - { - return this._layerPayload.layerId; - }, - - /** - * @return {string?} - */ - parentId: function() - { - return this._layerPayload.parentLayerId; - }, - - /** - * @return {WebInspector.Layer} - */ - parent: function() - { - return this._parent; - }, - - isRoot: function() - { - return !!this.parentId(); - }, - - children: function() - { - return this._children; - }, - - /** - * @param {WebInspector.Layer} child - */ - addChild: function(child) - { - if (child._parent) - console.assert(false, "Child already has a parent"); - this._children.push(child); - child._parent = this; - }, - - nodeIdForSelfOrAncestor: function() - { - for (var layer = this; layer; layer = layer._parent) { - var nodeId = layer._layerPayload["nodeId"]; - if (nodeId) - return nodeId; - } - return null; - }, - - /** - * @return {number} - */ - offsetX: function() - { - return this._layerPayload.offsetX; - }, - - /** - * @return {number} - */ - offsetY: function() - { - return this._layerPayload.offsetY; - }, - - /** - * @return {number} - */ - width: function() - { - return this._layerPayload.width; - }, - - /** - * @return {number} - */ - height: function() - { - return this._layerPayload.height; - }, - - /** - * @param {LayerTreeAgent.Layer} layerPayload - */ - _reset: function(layerPayload) - { - this._children = []; - this._parent = null; - this._layerPayload = layerPayload; - } -} - -/** - * @constructor - * @implements {LayerTreeAgent.Dispatcher} - * @param {WebInspector.LayerTreeModel} layerTreeModel - */ -WebInspector.LayerTreeDispatcher = function(layerTreeModel) -{ - this._layerTreeModel = layerTreeModel; -} - -WebInspector.LayerTreeDispatcher.prototype = { - layerTreeDidChange: function() - { - this._layerTreeModel._layerTreeChanged(); - } -} diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/Layers3DView.js b/chromium/third_party/WebKit/Source/devtools/front_end/Layers3DView.js deleted file mode 100644 index a2af860254b..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/Layers3DView.js +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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.View} - * @param {WebInspector.LayerTreeModel} model - */ -WebInspector.Layers3DView = function(model) -{ - WebInspector.View.call(this); - this.element.classList.add("fill"); - this.element.classList.add("layers-3d-view"); - this._model = model; - this._model.addEventListener(WebInspector.LayerTreeModel.Events.LayerTreeChanged, this._update, this); - this._rotatingContainerElement = this.element.createChild("div", "fill rotating-container"); - this.element.addEventListener("mousemove", this._onMouseMove.bind(this), false); - this.element.addEventListener("mousedown", this._onMouseDown.bind(this), false); - this._elementsByLayerId = {}; - this._rotateX = 0; - this._rotateY = 0; -} - -WebInspector.Layers3DView.prototype = { - onResize: function() - { - this._scale(); - }, - - wasShown: function() - { - if (this._needsUpdate) - this._update(); - }, - - _scale: function() - { - const padding = 40; - var scale = 1; - var root = this._model.root(); - if (!root) - return; - var scaleX = this.element.clientWidth / (root.width() + 2 * padding); - var scaleY = this.element.clientHeight / (root.height() + 2 * padding); - scale = Math.min(scaleX, scaleY); - var element = this._elementForLayer(root); - element.style.webkitTransform = "scale(" + scale + "," + scale +")"; - element.style.webkitTransformOrigin = padding + "px " + padding + "px"; - }, - - _update: function() - { - if (!this.isShowing()) { - this._needsUpdate = true; - return; - } - function updateLayer(layer) - { - var element = this._elementForLayer(layer); - this._updateLayerElement(element); - for (var childElement = element.firstElementChild; childElement;) { - var nextElement = childElement.nextSibling; - if (childElement.__layer && !this._model.layerById(childElement.__layer.id())) - childElement.remove(); - childElement = nextElement; - } - } - this._model.forEachLayer(updateLayer.bind(this)); - this._needsUpdate = false; - this._scale(); - }, - - /** - * @param {WebInspector.Layer} layer - * @return {Element} - */ - _elementForLayer: function(layer) - { - var element = this._elementsByLayerId[layer.id()]; - if (element) - return element; - element = document.createElement("div"); - element.className = "layer-container"; - element.__layer = layer; - ["fill back-wall", "side-wall top", "side-wall right", "side-wall bottom", "side-wall left"].forEach(element.createChild.bind(element, "div")); - this._elementsByLayerId[layer.id()] = element; - return element; - }, - - /** - * @param {Element} element - */ - _updateLayerElement: function(element) - { - var layer = element.__layer; - var style = element.style; - var parentElement = layer.parent() ? this._elementForLayer(layer.parent()) : this._rotatingContainerElement; - element.__depth = (parentElement.__depth || 0) + 1; - style.backgroundColor = this._colorForLayer(layer, element.__depth); - style.left = layer.offsetX() + "px"; - style.top = layer.offsetY() + "px"; - style.width = layer.width() + "px"; - style.height = layer.height() + "px"; - if (parentElement !== element.parentElement) - parentElement.appendChild(element); - }, - - /** - * @param {WebInspector.Layer} layer - * @param {number} depth - * @return {string} - */ - _colorForLayer: function(layer, depth) - { - const base = 144; - var component = base + 20 * ((depth - 1) % 5); - return "rgb(" + component + "," + component + "," + component + ")"; - }, - - /** - * @param {Event} event - */ - _onMouseDown: function(event) - { - if (event.which !== 1) - return; - this._originX = event.clientX; - this._originY = event.clientY; - this._oldRotateX = this._rotateX; - this._oldRotateY = this._rotateY; - }, - - /** - * @param {Event} event - */ - _onMouseMove: function(event) - { - if (event.which !== 1) - return; - this._rotateX = this._oldRotateX + (this._originY - event.clientY) / 2; - this._rotateY = this._oldRotateY - (this._originX - event.clientX) / 4; - this._rotatingContainerElement.style.webkitTransform = "rotateX(" + this._rotateX + "deg) rotateY(" + this._rotateY + "deg)"; - }, - - __proto__: WebInspector.View.prototype -} diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanel.js b/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanel.js deleted file mode 100644 index 9b1c5a54f6a..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanel.js +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -importScript("LayerTreeModel.js"); -importScript("LayerTree.js"); -importScript("Layers3DView.js"); - -/** - * @constructor - * @extends {WebInspector.Panel} - */ -WebInspector.LayersPanel = function() -{ - WebInspector.Panel.call(this, "layers"); - this.registerRequiredCSS("layersPanel.css"); - - const initialLayerTreeSidebarWidth = 225; - const minimumMainWidthPercent = 0.5; - this.createSidebarViewWithTree(); - this.sidebarElement.addStyleClass("outline-disclosure"); - this.sidebarTreeElement.removeStyleClass("sidebar-tree"); - this._model = new WebInspector.LayerTreeModel(); - this._layerTree = new WebInspector.LayerTree(this._model, this.sidebarTree); - this._layerDetailsSplitView = new WebInspector.SplitView(false, "layerDetailsSplitView"); - this._layerDetailsSplitView.show(this.splitView.mainElement); - this._layers3DView = new WebInspector.Layers3DView(this._model); - this._layers3DView.show(this._layerDetailsSplitView.mainElement); - this._model.requestLayers(); -} - -WebInspector.LayersPanel.prototype = { - wasShown: function() - { - WebInspector.Panel.prototype.wasShown.call(this); - this._layerTree.setVisible(true); - this.sidebarTreeElement.focus(); - }, - - willHide: function() - { - this._layerTree.setVisible(false); - WebInspector.Panel.prototype.willHide.call(this); - }, - - __proto__: WebInspector.Panel.prototype -} diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanelDescriptor.js b/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanelDescriptor.js deleted file mode 100644 index 95ad832993c..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/LayersPanelDescriptor.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. - * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (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.PanelDescriptor} - */ -WebInspector.LayersPanelDescriptor = function() -{ - WebInspector.PanelDescriptor.call(this, "layers", WebInspector.UIString("Layers"), "LayersPanel", "LayersPanel.js"); -} - -WebInspector.LayersPanelDescriptor.prototype = { - __proto__: WebInspector.PanelDescriptor.prototype -} diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/OverridesView.js b/chromium/third_party/WebKit/Source/devtools/front_end/OverridesView.js index 9d34d9c934a..efd64e456fa 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/OverridesView.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/OverridesView.js @@ -49,16 +49,37 @@ WebInspector.OverridesView = function() var topContainer = wrapper.createChild("div", "settings-tab help-content"); var enableOptionsContainer = topContainer.createChild("div", "help-block"); - var enableOnStartupField = this._createCheckboxSetting(WebInspector.UIString("Enable on DevTools startup"), WebInspector.settings.enableOverridesOnStartup); - enableOnStartupField.id = "enable-devtools-on-startup"; - this._enableOnStartupField = enableOnStartupField; - var enableLabel = this._createNonPersistedCheckbox(WebInspector.UIString("Enable"), this._setOverridesActive.bind(this)); + /** + * @param {boolean} enabled + */ + function enableClicked(enabled) + { + WebInspector.overridesSupport.setOverridesActive(enabled); + this._mainContainer.disabled = !enabled; + } + var boundEnableClicked = enableClicked.bind(this); + var enableLabel = this._createNonPersistedCheckbox(WebInspector.UIString("Enable"), boundEnableClicked); var enableCheckbox = enableLabel.getElementsByTagName("input")[0]; enableCheckbox.checked = WebInspector.settings.enableOverridesOnStartup.get(); enableOptionsContainer.appendChild(enableLabel); - enableOptionsContainer.appendChild(enableOnStartupField); + var enableOnStartupPara = this._createCheckboxSetting(WebInspector.UIString("Enable on DevTools startup"), WebInspector.settings.enableOverridesOnStartup); + enableOnStartupPara.id = "enable-devtools-on-startup"; + enableOptionsContainer.appendChild(enableOnStartupPara); + + /** + * @param {WebInspector.Event} event + */ + function enableOnStartupClicked(event) + { + var enableOnStartup = /** @type {boolean} */ (event.data); + if (enableOnStartup) { + enableCheckbox.checked = true; + boundEnableClicked(true); + } + } + WebInspector.settings.enableOverridesOnStartup.addChangeListener(enableOnStartupClicked, this); - var mainContainer = topContainer.createChild("fieldset", "help-container"); + var mainContainer = topContainer.createChild("div", "help-container"); this._mainContainer = mainContainer; function appendBlock(contentElements) @@ -75,7 +96,7 @@ WebInspector.OverridesView = function() appendBlock([this._createDeviceOrientationOverrideControl()]); appendBlock([this._createCheckboxSetting(WebInspector.UIString("Emulate touch events"), WebInspector.settings.emulateTouchEvents)]); appendBlock([this._createMediaEmulationElement()]); - this._setOverridesActive(enableCheckbox.checked); + boundEnableClicked(enableCheckbox.checked); this._statusElement = document.createElement("span"); this._statusElement.textContent = WebInspector.UIString("Overrides"); @@ -91,16 +112,6 @@ WebInspector.OverridesView.showInDrawer = function() WebInspector.OverridesView.prototype = { /** - * @param {boolean} active - */ - _setOverridesActive: function(active) - { - WebInspector.overridesSupport.setOverridesActive(active); - this._mainContainer.disabled = !active; - this._enableOnStartupField.disabled = !active; - }, - - /** * @param {string} name * @param {!WebInspector.Setting} setting * @param {function(boolean)=} callback diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanel.js b/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanel.js index e2e3f0dfa51..ead3c9255b5 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanel.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanel.js @@ -173,9 +173,6 @@ WebInspector.ScriptsPanel = function(workspaceForTest) WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this); WebInspector.advancedSearchController.registerSearchScope(new WebInspector.ScriptsSearchScope(this._workspace)); - - this._boundOnKeyUp = this._onKeyUp.bind(this); - this._boundOnKeyDown = this._onKeyDown.bind(this); } WebInspector.ScriptsPanel.prototype = { @@ -206,16 +203,10 @@ WebInspector.ScriptsPanel.prototype = { { WebInspector.Panel.prototype.wasShown.call(this); this._navigatorController.wasShown(); - - this.element.addEventListener("keydown", this._boundOnKeyDown, false); - this.element.addEventListener("keyup", this._boundOnKeyUp, false); }, willHide: function() { - this.element.removeEventListener("keydown", this._boundOnKeyDown, false); - this.element.removeEventListener("keyup", this._boundOnKeyUp, false); - WebInspector.Panel.prototype.willHide.call(this); WebInspector.closeViewInDrawer(); }, @@ -521,14 +512,13 @@ WebInspector.ScriptsPanel.prototype = { _executionLineChanged: function(event) { - var uiLocation = event.data.uiLocation; - var callFrame = event.data.callFrame; + var uiLocation = event.data; this._clearCurrentExecutionLine(); if (!uiLocation) return; var sourceFrame = this._getOrCreateSourceFrame(uiLocation.uiSourceCode); - sourceFrame.setExecutionLine(uiLocation.lineNumber, callFrame); + sourceFrame.setExecutionLine(uiLocation.lineNumber); this._executionSourceFrame = sourceFrame; }, @@ -744,34 +734,6 @@ WebInspector.ScriptsPanel.prototype = { * @param {Event=} event * @return {boolean} */ - _stepIntoSelectionClicked: function(event) - { - if (!this._paused) - return true; - - if (this._executionSourceFrame) { - var stepIntoMarkup = this._executionSourceFrame.stepIntoMarkup(); - if (stepIntoMarkup) - stepIntoMarkup.iterateSelection(event.shiftKey); - } - return true; - }, - - doStepIntoSelection: function(rawLocation) - { - if (!this._paused) - return; - - this._paused = false; - this._stepping = true; - this._clearInterface(); - WebInspector.debuggerModel.stepIntoSelection(rawLocation); - }, - - /** - * @param {Event=} event - * @return {boolean} - */ _stepOutClicked: function(event) { if (!this._paused) @@ -839,9 +801,6 @@ WebInspector.ScriptsPanel.prototype = { this._stepIntoButton = this._createButtonAndRegisterShortcuts("scripts-step-into", title, handler, WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepInto); debugToolbar.appendChild(this._stepIntoButton.element); - // Step into selection (keyboard shortcut only). - this.registerShortcuts(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepIntoSelection, this._stepIntoSelectionClicked.bind(this)) - // Step out. title = WebInspector.UIString("Step out of current function (%s)."); handler = this._stepOutClicked.bind(this); @@ -994,35 +953,6 @@ WebInspector.ScriptsPanel.prototype = { view.replaceAllWith(query, text); }, - _onKeyDown: function(event) - { - if (event.keyCode !== WebInspector.KeyboardShortcut.Keys.CtrlOrMeta.code) - return; - if (!this._paused || !this._executionSourceFrame) - return; - var stepIntoMarkup = this._executionSourceFrame.stepIntoMarkup(); - if (stepIntoMarkup) - stepIntoMarkup.moveSelectionTo(-1); - }, - - _onKeyUp: function(event) - { - if (event.keyCode !== WebInspector.KeyboardShortcut.Keys.CtrlOrMeta.code) - return; - if (!this._paused || !this._executionSourceFrame) - return; - var stepIntoMarkup = this._executionSourceFrame.stepIntoMarkup(); - if (!stepIntoMarkup) - return; - var currentPosition = stepIntoMarkup.getSelectedItemIndex(); - if (typeof currentPosition === "undefined") { - stepIntoMarkup.selectFirstToExecute(); - } else { - var rawLocation = stepIntoMarkup.getRawPosition(currentPosition); - this.doStepIntoSelection(rawLocation); - } - }, - _toggleFormatSource: function() { this._toggleFormatSourceButton.toggled = !this._toggleFormatSourceButton.toggled; diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanelDescriptor.js b/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanelDescriptor.js index 4fbb07ef237..68f29c38218 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanelDescriptor.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/ScriptsPanelDescriptor.js @@ -62,7 +62,6 @@ WebInspector.ScriptsPanelDescriptor.prototype = { section.addAlternateKeys(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.PauseContinue, WebInspector.UIString("Pause/Continue")); section.addAlternateKeys(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepOver, WebInspector.UIString("Step over")); section.addAlternateKeys(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepInto, WebInspector.UIString("Step into")); - section.addAlternateKeys(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepIntoSelection, WebInspector.UIString("Step into selection")); section.addAlternateKeys(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.StepOut, WebInspector.UIString("Step out")); var nextAndPrevFrameKeys = WebInspector.ScriptsPanelDescriptor.ShortcutKeys.NextCallFrame.concat(WebInspector.ScriptsPanelDescriptor.ShortcutKeys.PrevCallFrame); @@ -96,11 +95,6 @@ WebInspector.ScriptsPanelDescriptor.ShortcutKeys = { WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta) ], - StepIntoSelection: [ - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta), - WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta) - ], - StepOut: [ WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.F11, WebInspector.KeyboardShortcut.Modifiers.Shift), WebInspector.KeyboardShortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift | WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta) diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/Settings.js b/chromium/third_party/WebKit/Source/devtools/front_end/Settings.js index 8162d32a64e..9e07dbf738d 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/Settings.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/Settings.js @@ -261,7 +261,6 @@ WebInspector.ExperimentsSettings = function() this.frameworksDebuggingSupport = this._createExperiment("frameworksDebuggingSupport", "Enable frameworks debugging support"); this.refreshFileSystemsOnFocus = this._createExperiment("refreshFileSystemsOnFocus", "Refresh file system folders on window focus"); this.scrollBeyondEndOfFile = this._createExperiment("scrollBeyondEndOfFile", "Support scrolling beyond end of file"); - this.layersPanel = this._createExperiment("layersPanel", "Show Layers panel"); this._cleanUpSetting(); } diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/helpScreen.css b/chromium/third_party/WebKit/Source/devtools/front_end/helpScreen.css index 57589149e81..ed1bb8354ed 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/helpScreen.css +++ b/chromium/third_party/WebKit/Source/devtools/front_end/helpScreen.css @@ -98,7 +98,7 @@ body.platform-mac .help-window-main .help-window-title { -webkit-column-width: 470px; } -body.platform-mac .settings-tab .help-container { +body.platform-mac .settings-tab.help-container { -webkit-column-width: 430px; } @@ -189,36 +189,31 @@ body.platform-mac .help-key { margin: 0 0.5em; } -.settings-tab fieldset { - margin: 0; - padding: 0; - border: none; -} - -.help-block > fieldset { +.help-content > fieldset { margin: 3px 0; } -.help-block fieldset { +.help-content fieldset { + border: none; margin-left: 7px; padding: 0 initial; } -#general-tab-content .help-block fieldset legend { +#general-tab-content .help-content fieldset legend { font-size: 14px; } -body.platform-mac .settings-tab.help-block fieldset { +body.platform-mac .settings-tab.help-content fieldset { margin-left: 10px; } -.help-block fieldset p, -.help-block fieldset fieldset { +.help-content fieldset p, +.help-content fieldset fieldset { border-left: 1px solid rgb(128,128,128); padding-left: 30px; } -.help-block fieldset label { +.help-content fieldset label { padding-right: 4px; } @@ -431,12 +426,12 @@ body.platform-mac .help-content input[type=radio] { } .settings-tab p, -.settings-tab .help-block fieldset { +.settings-tab fieldset { margin: 12px 0; } -.settings-tab .help-block fieldset p, -.settings-tab .help-block fieldset fieldset { +.settings-tab fieldset p, +.settings-tab fieldset fieldset { border-left: none transparent; } diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.css b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.css index 98484be958d..49a89fdf7f7 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.css +++ b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.css @@ -2429,16 +2429,6 @@ body.inactive li.selected .bubble.search-matches { background-color: rgb(255, 255, 194); } -.source-frame-stepin-mark { - text-decoration: underline; - background-color: #bfccfe; -} - -.source-frame-stepin-mark-highlighted { - text-decoration: underline; - background-color: #698cfe; -} - .workers-list { list-style: none; margin: 0; diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.html b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.html index 2dc75042625..aafcd28e7f4 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.html +++ b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.html @@ -185,7 +185,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <script type="text/javascript" src="ProfilesPanelDescriptor.js"></script> <script type="text/javascript" src="ScriptsPanelDescriptor.js"></script> <script type="text/javascript" src="TimelinePanelDescriptor.js"></script> - <script type="text/javascript" src="LayersPanelDescriptor.js"></script> <script type="text/javascript" src="DockController.js"></script> <script type="text/javascript" src="TracingAgent.js"></script> <script type="text/javascript" src="DevToolsExtensionAPI.js"></script> diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.js b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.js index 5eaee481dd7..25bfe2a5aca 100644 --- a/chromium/third_party/WebKit/Source/devtools/front_end/inspector.js +++ b/chromium/third_party/WebKit/Source/devtools/front_end/inspector.js @@ -46,10 +46,6 @@ var WebInspector = { var audits = new WebInspector.PanelDescriptor("audits", WebInspector.UIString("Audits"), "AuditsPanel", "AuditsPanel.js"); var console = new WebInspector.PanelDescriptor("console", WebInspector.UIString("Console"), "ConsolePanel"); var allDescriptors = [elements, resources, network, scripts, timeline, profiles, audits, console]; - if (WebInspector.experimentsSettings.layersPanel.isEnabled()) { - var layers = new WebInspector.LayersPanelDescriptor(); - allDescriptors.push(layers); - } var allProfilers = [profiles]; if (WebInspector.experimentsSettings.customizableToolbar.isEnabled()) { allProfilers = []; diff --git a/chromium/third_party/WebKit/Source/devtools/front_end/layersPanel.css b/chromium/third_party/WebKit/Source/devtools/front_end/layersPanel.css deleted file mode 100644 index 3763b73962a..00000000000 --- a/chromium/third_party/WebKit/Source/devtools/front_end/layersPanel.css +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -.layers.panel .outline-disclosure { - z-index: 10; -} - -div.outline-disclosure > ol { - margin-left: -12px; -} - -.layers.panel .outline-disclosure ol.children { - padding-left: 12px; -} - -.layers-3d-view { - overflow: hidden; -} - -.layers-3d-view .rotating-container { - -webkit-transform-style: preserve-3d; -} - -.layers-3d-view .layer-container { - position: absolute; - opacity: 0.8; - border: 1px solid rgba(40, 40, 40, 0.8); - -webkit-transform: translateZ(20px); - -webkit-transform-style: preserve-3d; -} - -.layer-container .side-wall { - position: absolute; - background-color: inherit; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; - height: 4px; - width: 4px; - -webkit-transform-origin: 0 0; - border: solid black 1px; -} - -.layer-container .back-wall { - -webkit-transform: translateZ(-4px); - background-color: inherit; -} - -.layer-container .side-wall.top { - width: auto; - bottom: auto; - -webkit-transform: rotateX(-90deg); -} - -.layer-container .side-wall.bottom { - width: auto; - top: auto; - -webkit-transform: translateY(4px) rotateX(-90deg); -} - -.layer-container .side-wall.left { - height: auto; - right: auto; - -webkit-transform: rotateY(90deg); -} - -.layer-container .side-wall.right { - height: auto; - left: auto; - -webkit-transform: translateX(4px) rotateY(90deg); -} diff --git a/chromium/third_party/WebKit/Source/devtools/protocol.json b/chromium/third_party/WebKit/Source/devtools/protocol.json index 5cb1ddff5b8..6e56eceb79e 100644 --- a/chromium/third_party/WebKit/Source/devtools/protocol.json +++ b/chromium/third_party/WebKit/Source/devtools/protocol.json @@ -3216,6 +3216,7 @@ "description": "Profile.", "properties": [ { "name": "head", "$ref": "CPUProfileNode" }, + { "name": "idleTime", "type": "number", "description": "Idle time in seconds." }, { "name": "startTime", "type": "number", "description": "Profiling start time in seconds." }, { "name": "endTime", "type": "number", "description": "Profiling end time in seconds." }, { "name": "samples", "optional": true, "type": "array", "items": { "type": "integer" }, "description": "Ids of samples top nodes." } @@ -3497,10 +3498,8 @@ "description": "Resource state descriptor.", "properties": [ { "name": "name", "type": "string", "description": "State name." }, - { "name": "enumValueForName", "type": "string", "optional": true, "description": "String representation of the enum value, if <code>name</code> stands for an enum." }, { "name": "value", "$ref": "CallArgument", "optional": true, "description": "The value associated with the particular state." }, - { "name": "values", "type": "array", "items": { "$ref": "ResourceStateDescriptor" }, "optional": true, "description": "Array of values associated with the particular state. Either <code>value</code> or <code>values</code> will be specified." }, - { "name": "isArray", "type": "boolean", "optional": true, "description": "True iff the given <code>values</code> items stand for an array rather than a list of grouped states." } + { "name": "values", "type": "array", "items": { "$ref": "ResourceStateDescriptor" }, "optional": true, "description": "Array of values associated with the particular state. Either <code>value</code> or <code>values</code> will be specified." } ] }, { @@ -3519,11 +3518,9 @@ "type": "object", "properties": [ { "name": "description", "type": "string", "description": "String representation of the object." }, - { "name": "enumName", "type": "string", "optional": true, "description": "Enum name, if any, that stands for the value (for example, a WebGL enum name)." }, { "name": "resourceId", "$ref": "ResourceId", "optional": true, "description": "Resource identifier. Specified for <code>Resource</code> objects only." }, { "name": "type", "type": "string", "optional": true, "enum": ["object", "function", "undefined", "string", "number", "boolean"], "description": "Object type. Specified for non <code>Resource</code> objects only." }, - { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date"], "description": "Object subtype hint. Specified for <code>object</code> type values only." }, - { "name": "remoteObject", "$ref": "Runtime.RemoteObject", "optional": true, "description": "The <code>RemoteObject</code>, if requested." } + { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date"], "description": "Object subtype hint. Specified for <code>object</code> type values only." } ] }, { diff --git a/chromium/third_party/WebKit/Source/devtools/scripts/compile_frontend.py b/chromium/third_party/WebKit/Source/devtools/scripts/compile_frontend.py index 3df42dd6680..01eeb46b746 100755 --- a/chromium/third_party/WebKit/Source/devtools/scripts/compile_frontend.py +++ b/chromium/third_party/WebKit/Source/devtools/scripts/compile_frontend.py @@ -312,16 +312,6 @@ modules = [ ] }, { - "name": "layers", - "dependencies": ["components"], - "sources": [ - "LayerTreeModel.js", - "LayersPanel.js", - "LayerTree.js", - "Layers3DView.js", - ] - }, - { "name": "extensions", "dependencies": ["components"], "sources": [ |