Skip to content

Commit

Permalink
squash 'resources/unpacked/devtools' changes from 791c2d1..3284500
Browse files Browse the repository at this point in the history
3284500 DevTools: use standard tabbed pane and widgets for the service workers view.
11923aa DevTools: enable capture screen with device art.
3107a42 [DevTools] Fix bug with WebSockets flipping frames
d3630b9 DevTools: do not run acorn in the UI thread
25c1120 Devtools: Add trigger add to homescreen to command menu
b396261 Devtools: Remove non-existant empty cache, hard reload from command menu BUG=589353
d9247b7 Devtools Animations: Correctly sync scrubber when first animation ended
c3bd2dc [DevTools] Check mappings.length in  BlackboxManager on SourceMap loaded
093c952 DevTools: [SSP] accept editing on mouse click
b270b46 [DevTools] Fixed context menu breakage when edit dom in console
9d536f7 Devtools: Add screenshot button to device mode toolbar.
974c4c0 DevTools: request app banner from DevTools without #enable-add-to-shelf flag while emulating.
ab84c2c DevTools: [SASS] improve scss parser
93559b1 [DevTools] Added serverIPaddress to HAR output
dea4302 DevTools: use standard UI widget for the service workers toolbar.
6eac01e DevTools: [SASS] simplify SCSS parsing
4f27144 DevTools: simplify WI.FormattedContentBuilder
8d1bea1 [DevTools] Add DebuggerScript.js compilation to compile_frontend.py
8c3efc3 [DevTools] Introduced WebInspector.LiveLocationPool
e81e238 DevTools: introduce liveSASS hidden experiment
5747abb [DevTools] Remove promise inspector experiment
be19483 DevTools: [CSS] reload sourcemap as SASS watchdog updates CSS file
1b214ef Added regex support in search for network tab
bcf3547 Show v8.parseOnBackground in DevTools Timeline
3cc3585 DevTools: Refactor CPU profiler: get rid of data object.
cf35d4d [DevTools] Use InspectorFrontendHost.readyForTest for layout tests.
c87aaf6 [DevTools] Add a bunch of emulation actions to command menu.
a02e528 DevTools: make Timeline flame chart nice again.
12affcb SourceFrame implements Search interface SourceFrame should now implement Search interface.
6b8f8a8 DevTools: [ux regression] There is no way to clear console history.
fbd4149 Handle the case for older releases (pre M51) by adding CSS fixes in compatibility script to handle the case of a border-image element that lacks the border-style.
2c06e0c Revert of [DevTools] Use InspectorFrontendHost.readyForTest for layout tests. (patchset #3 id:40001 of https://codereview.chromium.org/1819243002/ )

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: 3284500
  • Loading branch information
darwin committed Mar 31, 2016
1 parent 0e854f4 commit a829a47
Show file tree
Hide file tree
Showing 87 changed files with 1,567 additions and 2,112 deletions.
3 changes: 0 additions & 3 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ devtools_modules_js_files =
gypi_values.devtools_layers_js_files +
gypi_values.devtools_network_js_files +
gypi_values.devtools_profiler_js_files +
gypi_values.devtools_promises_js_files +
gypi_values.devtools_resources_js_files +
gypi_values.devtools_sass_js_files +
gypi_values.devtools_security_js_files +
Expand Down Expand Up @@ -150,7 +149,6 @@ action("generate_devtools_grd") {
resources_out_dir + "layers_module.js",
resources_out_dir + "network_module.js",
resources_out_dir + "profiler_module.js",
resources_out_dir + "promises_module.js",
resources_out_dir + "resources_module.js",
resources_out_dir + "sass_module.js",
resources_out_dir + "security_module.js",
Expand Down Expand Up @@ -282,7 +280,6 @@ action("build_applications") {
resources_out_dir + "layers_module.js",
resources_out_dir + "network_module.js",
resources_out_dir + "profiler_module.js",
resources_out_dir + "promises_module.js",
resources_out_dir + "resources_module.js",
resources_out_dir + "sass_module.js",
resources_out_dir + "security_module.js",
Expand Down
2 changes: 0 additions & 2 deletions devtools.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
'<(PRODUCT_DIR)/resources/inspector/layers_module.js',
'<(PRODUCT_DIR)/resources/inspector/network_module.js',
'<(PRODUCT_DIR)/resources/inspector/profiler_module.js',
'<(PRODUCT_DIR)/resources/inspector/promises_module.js',
'<(PRODUCT_DIR)/resources/inspector/resources_module.js',
'<(PRODUCT_DIR)/resources/inspector/sass_module.js',
'<(PRODUCT_DIR)/resources/inspector/security_module.js',
Expand Down Expand Up @@ -283,7 +282,6 @@
'<(_output_path)/layers_module.js',
'<(_output_path)/network_module.js',
'<(_output_path)/profiler_module.js',
'<(_output_path)/promises_module.js',
'<(_output_path)/resources_module.js',
'<(_output_path)/sass_module.js',
'<(_output_path)/security_module.js',
Expand Down
9 changes: 1 addition & 8 deletions devtools.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
'front_end/components/ObjectPopoverHelper.js',
'front_end/components/ObjectPropertiesSection.js',
'front_end/components/RemoteObjectPreviewFormatter.js',
'front_end/components/RequestAppBannerActionDelegate.js',
'front_end/components/ShortcutsScreen.js',
'front_end/components/EventListenersUtils.js',
'front_end/components/EventListenersView.js',
Expand Down Expand Up @@ -337,7 +338,6 @@
'front_end/network/module.json',
'front_end/platform/module.json',
'front_end/profiler/module.json',
'front_end/promises/module.json',
'front_end/resources/module.json',
'front_end/sass/module.json',
'front_end/security/module.json',
Expand Down Expand Up @@ -497,10 +497,6 @@
'front_end/extensions/ExtensionView.js',
'<@(devtools_extension_api_files)',
],
'devtools_promises_js_files': [
'front_end/promises/promisePane.css',
'front_end/promises/PromisePane.js',
],
'devtools_heap_snapshot_worker_js_files': [
'front_end/common/TextUtils.js',
'front_end/common/UIString.js',
Expand Down Expand Up @@ -775,7 +771,6 @@
'<@(devtools_layers_js_files)',
'<@(devtools_network_js_files)',
'<@(devtools_profiler_js_files)',
'<@(devtools_promises_js_files)',
'<@(devtools_resources_js_files)',
'<@(devtools_sass_js_files)',
'<@(devtools_security_js_files)',
Expand Down Expand Up @@ -823,7 +818,6 @@
'front_end/Images/localStorage.png',
'front_end/Images/navigationControls.png',
'front_end/Images/navigationControls_2x.png',
'front_end/Images/notifications.svg',
'front_end/Images/paneAddButtons.png',
'front_end/Images/paneFilterButtons.png',
'front_end/Images/paneRefreshButtons.png',
Expand Down Expand Up @@ -867,7 +861,6 @@
'front_end/Images/toolbarItemSelected.png',
'front_end/Images/touchCursor.png',
'front_end/Images/touchCursor_2x.png',
'front_end/Images/updateServiceWorker.svg',
],
'devtools_extension_api_files': [
'front_end/extensions/ExtensionAPI.js',
Expand Down
1 change: 0 additions & 1 deletion front_end/Images/notifications.svg

This file was deleted.

2 changes: 1 addition & 1 deletion front_end/Images/src/optimize_png.hashes
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"breakpoint.svg": "69cd92d807259c022791112809b97799",
"settingsListRemove.svg": "ce9e7c5c5cdaef28e6ee51d9478d5485",
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"toolbarButtonGlyphs.svg": "fcf3159499e07a580dc9bd827d4f627f"
"toolbarButtonGlyphs.svg": "304b6a326639d26c4710d57205413323"
}
2 changes: 1 addition & 1 deletion front_end/Images/src/svg2png.hashes
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"breakpoint.svg": "69cd92d807259c022791112809b97799",
"settingsListRemove.svg": "ce9e7c5c5cdaef28e6ee51d9478d5485",
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"toolbarButtonGlyphs.svg": "fcf3159499e07a580dc9bd827d4f627f"
"toolbarButtonGlyphs.svg": "304b6a326639d26c4710d57205413323"
}
15 changes: 9 additions & 6 deletions front_end/Images/src/toolbarButtonGlyphs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front_end/Images/toolbarButtonGlyphs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified front_end/Images/toolbarButtonGlyphs_2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 0 additions & 81 deletions front_end/Images/updateServiceWorker.svg

This file was deleted.

2 changes: 1 addition & 1 deletion front_end/Tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ TestSuite.prototype.evaluateInConsole_ = function(code, callback)
function innerEvaluate()
{
WebInspector.context.removeFlavorChangeListener(WebInspector.ExecutionContext, showConsoleAndEvaluate, this);
var consoleView = WebInspector.ConsolePanel._view();
var consoleView = WebInspector.ConsoleView.instance();
consoleView._prompt.setText(code);
consoleView._promptElement.dispatchEvent(TestSuite.createKeyEvent("Enter"));

Expand Down
7 changes: 6 additions & 1 deletion front_end/animation/AnimationModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,12 @@ WebInspector.AnimationModel.AnimationGroup.prototype = {
return !error ? currentTime : 0;
}

return this.target().animationAgent().getCurrentTime(this._animations[0].id(), callback).catchException(0);
var longestAnim = null;
for (var anim of this._animations) {
if (!longestAnim || anim.endTime() > longestAnim.endTime())
longestAnim = anim;
}
return this.target().animationAgent().getCurrentTime(longestAnim.id(), callback).catchException(0);
},

/**
Expand Down
1 change: 1 addition & 0 deletions front_end/bindings/BlackboxManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ WebInspector.BlackboxManager.prototype = {
if (!mappings.length) {
if (previousScriptState.length > 0)
return this._setScriptState(script, []);
return Promise.resolve();
}

var currentBlackboxed = false;
Expand Down
10 changes: 3 additions & 7 deletions front_end/bindings/BreakpointManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,7 @@ WebInspector.BreakpointManager.TargetBreakpoint = function(debuggerModel, breakp
this._networkMapping = networkMapping;
this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;

/** @type {!Array.<!WebInspector.DebuggerWorkspaceBinding.Location>} */
this._liveLocations = [];
this._liveLocations = new WebInspector.LiveLocationPool();

/** @type {!Object.<string, !WebInspector.UILocation>} */
this._uiLocations = {};
Expand All @@ -763,10 +762,7 @@ WebInspector.BreakpointManager.TargetBreakpoint.prototype = {
this._breakpoint._removeUILocation(uiLocations[i]);

this._uiLocations = {};

for (var i = 0; i < this._liveLocations.length; ++i)
this._liveLocations[i].dispose();
this._liveLocations = [];
this._liveLocations.disposeAll();
},

_scheduleUpdateInDebugger: function()
Expand Down Expand Up @@ -944,7 +940,7 @@ WebInspector.BreakpointManager.TargetBreakpoint.prototype = {
this._breakpoint.remove();
return false;
}
this._liveLocations.push(this._debuggerWorkspaceBinding.createLiveLocation(location, this._locationUpdated.bind(this, location)));
this._debuggerWorkspaceBinding.createLiveLocation(location, this._locationUpdated.bind(this, location), this._liveLocations);
return true;
},

Expand Down
19 changes: 12 additions & 7 deletions front_end/bindings/CSSWorkspaceBinding.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ WebInspector.CSSWorkspaceBinding.prototype = {
/**
* @param {!WebInspector.CSSLocation} rawLocation
* @param {function(!WebInspector.LiveLocation)} updateDelegate
* @param {!WebInspector.LiveLocationPool} locationPool
* @return {!WebInspector.CSSWorkspaceBinding.LiveLocation}
*/
createLiveLocation: function(rawLocation, updateDelegate)
createLiveLocation: function(rawLocation, updateDelegate, locationPool)
{
var header = rawLocation.styleSheetId ? rawLocation.cssModel().styleSheetHeaderForId(rawLocation.styleSheetId) : null;
return new WebInspector.CSSWorkspaceBinding.LiveLocation(rawLocation.cssModel(), header, rawLocation, this, updateDelegate);
return new WebInspector.CSSWorkspaceBinding.LiveLocation(rawLocation.cssModel(), header, rawLocation, this, updateDelegate, locationPool);
},

/**
Expand Down Expand Up @@ -313,16 +314,17 @@ WebInspector.CSSWorkspaceBinding.HeaderInfo.prototype = {

/**
* @constructor
* @extends {WebInspector.LiveLocation}
* @extends {WebInspector.LiveLocationWithPool}
* @param {!WebInspector.CSSModel} cssModel
* @param {?WebInspector.CSSStyleSheetHeader} header
* @param {!WebInspector.CSSLocation} rawLocation
* @param {!WebInspector.CSSWorkspaceBinding} binding
* @param {function(!WebInspector.LiveLocation)} updateDelegate
* @param {!WebInspector.LiveLocationPool} locationPool
*/
WebInspector.CSSWorkspaceBinding.LiveLocation = function(cssModel, header, rawLocation, binding, updateDelegate)
WebInspector.CSSWorkspaceBinding.LiveLocation = function(cssModel, header, rawLocation, binding, updateDelegate, locationPool)
{
WebInspector.LiveLocation.call(this, updateDelegate);
WebInspector.LiveLocationWithPool.call(this, updateDelegate, locationPool);
this._cssModel = cssModel;
this._rawLocation = rawLocation;
this._binding = binding;
Expand Down Expand Up @@ -392,9 +394,12 @@ WebInspector.CSSWorkspaceBinding.LiveLocation.prototype = {
return uiSourceCode.uiLocation(cssLocation.lineNumber, cssLocation.columnNumber);
},

/**
* @override
*/
dispose: function()
{
WebInspector.LiveLocation.prototype.dispose.call(this);
WebInspector.LiveLocationWithPool.prototype.dispose.call(this);
if (this._header)
this._binding._removeLiveLocation(this);
this._cssModel.removeEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
Expand All @@ -410,7 +415,7 @@ WebInspector.CSSWorkspaceBinding.LiveLocation.prototype = {
return false;
},

__proto__: WebInspector.LiveLocation.prototype
__proto__: WebInspector.LiveLocationWithPool.prototype
}

/**
Expand Down
Loading

0 comments on commit a829a47

Please sign in to comment.