Skip to content

Commit

Permalink
squash 'resources/unpacked/devtools' changes from 8893c96..2975ecf
Browse files Browse the repository at this point in the history
2975ecf [DevTools] Add touch to sensors view.
6aada89 Timeline: extract and rename TracingModelLoader into a file of its own
2d4d494 DevTools: extract TimelineProfileTree into a file for better reuse
94e222e DevTools: [CSSP] do not wrap computed properties.
32c096c DevTools: Tweak timeline group headers drawing
8c6c1b4 [DevTools] Replace (un)blackboxURL methods with (un)blackboxUISourceCode
336beef DevTools: report resources as loaded upon failed request from workers.
21927a0 DevTools: [Console] do not replace '\t' control character
b753ee4 [DevTools] Restore showViewportSizeOnResize.
1e5a8f6 [DevTools] Per debugger model state storage in BlackboxManager
abd1fba Timeline: make flamechart groups collapsible
b128f30 [DevTools] Disable JavaScript checkbox does not work.
880d35f DevTools: [Console] display control characters in console commands
6c90ade DevTools: [SASS] implement SASSProcessor.InsertProperties operation
03cdbcd Devtools: Allow filtered list widget keyboard navigation to wrap around
9edfc28 DevTools: [SASS] implement SASSProcessor.RemoveProperty operation
782faca Devtools: Switch JS execution context to match inspected node
33698a9 DevTools: [SASS] implement SASSProcessor.ToggleProperty operation
a6d7338 [DevTools] Added Linkify.linkifyStackTraceTopFrame method
70ca603 DevTools: [SASS] add WI.SASSProcessor and first "setText" operation
058aca3 DevTools: [SASS] get rid of WI.ASTSourceMap.rebaseForCSSDiff/rebaseForSASSDiff
a08075b [DevTools] Add "show throttling" to device mode instead of "configure network".
5a074fb Indexed DB: Rename "int version" to "version"
4c5344b DevTools: [CSS] fix CSS style formatter
75fb6f6 DevTools: remove oldText from SourceEdit
3a85dd8 [DevTools] Fix minor bugs in frontend.
2c24ca0 DevTools: [CSSP] make "goto source" icon crisp
ff9eff8 DevTools: Extract SegmentedRange from TimelineIRModel to utilities.js
cab214a Reland of [DevTools] Move screen orientation override to RenderWidgetScreenMetricsEmulator. (patchset #1 id:1 of https://codereview.chromium.org/1723663005/ )
b0611c8 Revert of [DevTools] Move screen orientation override to RenderWidgetScreenMetricsEmulator. (patchset #5 id:80001 of https://codereview.chromium.org/1711083002/ )
69e96fb DevTools: migrate remote debugging protocol generators to jinja2.
22e4373 [DevTools] Make max-width media queries symmetric.
33be141 DevTools: remove FileSystem API inspection from experiments, point users to the extension.
ecf45f5 [DevTools] Move screen orientation override to RenderWidgetScreenMetricsEmulator.
4a73f2e [DevTools] Add device type to custom device presets.
9ae3c2c [DevTools] Restore show rulers functionality.
97f87ca [DevTools] Don't load sourcemap for blackboxed scripts
a58cff0 [DevTools] Add sourceURL deprecation message for scripts
9bbd93f DevTools: [SASS] re-implement SASSSupport.Rule.insertProperties
de2e154 DevTools: improve SCSS parser to correctly handle variable expansions
ba5dd8b DevTools: [SASS] correctly add sass module
4af0766 DevTools: Make JSFrames occupy all the space between samples.
ae10e88 DevTools: rename WI.SASSLiveSourceMap into WI.ASTSourceMap.
c8d03ed Revert of DevTools: improve SCSS parser to correctly handle variable expansions (patchset #1 id:1 of https://codereview.chromium.org/1713783003/ )
7a2d28f DevTools: improve SCSS parser to correctly handle variable expansions
d41f526 DevTools: teach WI.CSSParser to parse style ranges
4c9b383 DevTools: introduce WI.ASTService instead of WI.SASSWorkspaceAdapter
55f115b DevTools: [Console] wrap long strings in console
4184a0d Revert: [DevTools] Removed support deprecated (//@|/*@) source(URL|MappingURL)=
2cc00e1 Animation: Add optional specified animation id
e7ca2a5 DevTools: Make FlameChart._measureText use Map for caching.
8e8a476 DevTools: Reduce unattributed size in timeline tree view
c8f0ddb [DevTools] Rework device scale factor and user agent type UI.
dc9e2b3 DevTools: [CSS] Add CSS.setMultipleStyleTexts command to CSS domain
6cfae37 Timeline FlameChart: clean up a handful of redundant member fields
be5c866 [DevTools] Blackboxing in LiveLocations is supported in Linkifier
44eeeb2 [DevTools] Replace let with var
c296234 DevTools: Prepare for CPU profiler code events turn from Instant to Meta.
f2eb763 [DevTools] Support CommandLineAPI in snippets
c8ceef9 Revert of Change Event.deepPath to a method (patchset #4 id:60001 of https://codereview.chromium.org/1637813002/ )
a19117d DevTools: add input event instrumentation test
4e76f53 [DevTools] Add workaround for closure compiler for Event.prototype.deepPath
6b7cfe8 DevTools: remove bottom-up flame charts
3487e2c Change Event.deepPath to a method

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: 2975ecf
  • Loading branch information
darwin committed Feb 29, 2016
1 parent d3ca86e commit aa7900c
Show file tree
Hide file tree
Showing 97 changed files with 3,565 additions and 3,523 deletions.
3 changes: 3 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ devtools_modules_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 +
gypi_values.devtools_screencast_js_files +
gypi_values.devtools_script_formatter_worker_js_files +
Expand Down Expand Up @@ -150,6 +151,7 @@ action("generate_devtools_grd") {
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",
resources_out_dir + "script_formatter_worker_module.js",
resources_out_dir + "settings_module.js",
Expand Down Expand Up @@ -281,6 +283,7 @@ action("build_applications") {
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",
resources_out_dir + "screencast_module.js",
resources_out_dir + "script_formatter_worker_module.js",
Expand Down
2 changes: 1 addition & 1 deletion Inspector-1.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@
"description": "Database with an array of object stores.",
"properties": [
{ "name": "name", "type": "string", "description": "Database name." },
{ "name": "intVersion", "type": "integer", "description": "Database version." },
{ "name": "version", "type": "integer", "description": "Database version." },
{ "name": "objectStores", "type": "array", "items": { "$ref": "ObjectStore" }, "description": "Object stores in this database." }
]
},
Expand Down
2 changes: 2 additions & 0 deletions devtools.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
'<(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',
'<(PRODUCT_DIR)/resources/inspector/script_formatter_worker_module.js',
'<(PRODUCT_DIR)/resources/inspector/settings_module.js',
Expand Down Expand Up @@ -282,6 +283,7 @@
'<(_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',
'<(_output_path)/screencast_module.js',
'<(_output_path)/script_formatter_worker_module.js',
Expand Down
19 changes: 9 additions & 10 deletions devtools.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
'<@(devtools_host_js_files)',
'<@(devtools_main_js_files)',
'<@(devtools_platform_js_files)',
'<@(devtools_sass_js_files)',
'<@(devtools_sdk_js_files)',
'<@(devtools_toolbox_bootstrap_js_files)',
'<@(devtools_ui_js_files)',
Expand Down Expand Up @@ -87,11 +86,11 @@
'front_end/components/customPreviewSection.css',
'front_end/components/domUtils.css',
'front_end/components/inspectorViewTabbedPane.css',
'front_end/components/networkConditionsSettingsTab.css',
'front_end/components/objectPropertiesSection.css',
'front_end/components/objectValue.css',
'front_end/components/CustomPreviewSection.js',
'front_end/components/DataSaverInfobar.js',
'front_end/components/DebuggerPresentationUtils.js',
'front_end/components/DockController.js',
'front_end/components/DOMBreakpointsSidebarPane.js',
'front_end/components/DOMPresentationUtils.js',
Expand All @@ -102,6 +101,7 @@
'front_end/components/InspectorView.js',
'front_end/components/BreakpointsSidebarPaneBase.js',
'front_end/components/Linkifier.js',
'front_end/components/NetworkConditionsSelector.js',
'front_end/components/ObjectPopoverHelper.js',
'front_end/components/ObjectPropertiesSection.js',
'front_end/components/RemoteObjectPreviewFormatter.js',
Expand All @@ -118,8 +118,9 @@
'front_end/host/UserMetrics.js',
],
'devtools_sass_js_files': [
'front_end/sass/SASSLiveSourceMap.js',
'front_end/sass/SASSWorkspaceAdapter.js',
'front_end/sass/ASTService.js',
'front_end/sass/ASTSourceMap.js',
'front_end/sass/SASSProcessor.js',
'front_end/sass/SASSSupport.js',
],
'devtools_screencast_js_files': [
Expand Down Expand Up @@ -213,6 +214,7 @@
'front_end/emulation/InspectedPagePlaceholder.js',
'front_end/emulation/MediaQueryInspector.js',
'front_end/emulation/SensorsView.js',
'front_end/emulation/TouchModel.js',
],
'devtools_ui_js_files': [
'front_end/ui/checkboxTextLabel.css',
Expand Down Expand Up @@ -502,7 +504,6 @@
'devtools_network_js_files': [
'front_end/network/blockedURLsPane.css',
'front_end/network/eventSourceMessagesView.css',
'front_end/network/networkConditionsSettingsTab.css',
'front_end/network/networkConfigView.css',
'front_end/network/networkLogView.css',
'front_end/network/networkPanel.css',
Expand All @@ -515,7 +516,6 @@
'front_end/network/FilterSuggestionBuilder.js',
'front_end/network/HARWriter.js',
'front_end/network/JSONView.js',
'front_end/network/NetworkConditionsSelector.js',
'front_end/network/NetworkConfigView.js',
'front_end/network/NetworkDataGridNode.js',
'front_end/network/NetworkItemView.js',
Expand Down Expand Up @@ -561,12 +561,8 @@
'front_end/resources/DatabaseModel.js',
'front_end/resources/DatabaseQueryView.js',
'front_end/resources/DatabaseTableView.js',
'front_end/resources/DirectoryContentView.js',
'front_end/resources/DOMStorageModel.js',
'front_end/resources/DOMStorageItemsView.js',
'front_end/resources/FileContentView.js',
'front_end/resources/FileSystemModel.js',
'front_end/resources/FileSystemView.js',
'front_end/resources/IndexedDBViews.js',
'front_end/resources/IndexedDBModel.js',
'front_end/resources/ResourcesPanel.js',
Expand Down Expand Up @@ -687,9 +683,11 @@
'front_end/timeline/TimelineIRModel.js',
'front_end/timeline/TimelineJSProfile.js',
'front_end/timeline/TimelineLayersView.js',
'front_end/timeline/TimelineLoader.js',
'front_end/timeline/TimelineModel.js',
'front_end/timeline/TimelinePaintProfilerView.js',
'front_end/timeline/TimelinePanel.js',
'front_end/timeline/TimelineProfileTree.js',
'front_end/timeline/TimelineTreeView.js',
'front_end/timeline/TimelineUIUtils.js',
'front_end/timeline/TransformController.js',
Expand Down Expand Up @@ -755,6 +753,7 @@
'<@(devtools_profiler_js_files)',
'<@(devtools_promises_js_files)',
'<@(devtools_resources_js_files)',
'<@(devtools_sass_js_files)',
'<@(devtools_security_js_files)',
'<@(devtools_screencast_js_files)',
'<@(devtools_script_formatter_worker_js_files)',
Expand Down
6 changes: 3 additions & 3 deletions front_end/Images/src/optimize_png.hashes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"errorWave.svg": "e183fa242a22ed4784a92f6becbc2c45",
"breakpoint.svg": "69cd92d807259c022791112809b97799",
"settingsListRemove.svg": "ce9e7c5c5cdaef28e6ee51d9478d5485",
"toolbarButtonGlyphs.svg": "9cb447c4c5e8e65ae5c9a32983a6e515",
"breakpoint.svg": "69cd92d807259c022791112809b97799"
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"toolbarButtonGlyphs.svg": "fcf3159499e07a580dc9bd827d4f627f"
}
6 changes: 3 additions & 3 deletions front_end/Images/src/svg2png.hashes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"errorWave.svg": "e183fa242a22ed4784a92f6becbc2c45",
"breakpoint.svg": "69cd92d807259c022791112809b97799",
"settingsListRemove.svg": "ce9e7c5c5cdaef28e6ee51d9478d5485",
"toolbarButtonGlyphs.svg": "9cb447c4c5e8e65ae5c9a32983a6e515",
"breakpoint.svg": "69cd92d807259c022791112809b97799"
"breakpointConditional.svg": "4cf90210b2af2ed84db2f60b07bcde28",
"toolbarButtonGlyphs.svg": "fcf3159499e07a580dc9bd827d4f627f"
}
10 changes: 5 additions & 5 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.
10 changes: 1 addition & 9 deletions front_end/animation/AnimationModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ WebInspector.AnimationModel.Animation.prototype = {
*/
name: function()
{
return this.source().name();
return this._payload.name;
},

/**
Expand Down Expand Up @@ -513,14 +513,6 @@ WebInspector.AnimationModel.AnimationEffect.prototype = {
return this._payload.fill;
},

/**
* @return {string}
*/
name: function()
{
return this._payload.name;
},

/**
* @return {!Promise.<!WebInspector.DOMNode>}
*/
Expand Down
Loading

0 comments on commit aa7900c

Please sign in to comment.