| Index: third_party/WebKit/Source/devtools/front_end/timeline/module.json
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/module.json b/third_party/WebKit/Source/devtools/front_end/timeline/module.json
|
| index 1f16c0d43ebdad9d9ce9a3b6a2823a1b899ef951..963561347b431a8d7fa77ce43f80579cda215d2c 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/timeline/module.json
|
| +++ b/third_party/WebKit/Source/devtools/front_end/timeline/module.json
|
| @@ -1,149 +1,165 @@
|
| {
|
| - "extensions": [
|
| + "extensions": [
|
| + {
|
| + "type": "view",
|
| + "location": "panel",
|
| + "id": "timeline",
|
| + "title": "Performance",
|
| + "order": 50,
|
| + "className": "Timeline.TimelinePanel"
|
| + },
|
| + {
|
| + "type": "setting",
|
| + "category": "Profiler",
|
| + "title": "Hide chrome frame in Layers view",
|
| + "settingName": "frameViewerHideChromeWindow",
|
| + "settingType": "boolean",
|
| + "defaultValue": false
|
| + },
|
| + {
|
| + "type": "@Common.QueryParamHandler",
|
| + "name": "loadTimelineFromURL",
|
| + "className": "Timeline.LoadTimelineHandler"
|
| + },
|
| + {
|
| + "type": "context-menu-item",
|
| + "location": "timelineMenu/open",
|
| + "actionId": "timeline.load-from-file"
|
| + },
|
| + {
|
| + "type": "context-menu-item",
|
| + "location": "timelineMenu/open",
|
| + "actionId": "timeline.save-to-file"
|
| + },
|
| + {
|
| + "type": "@UI.ActionDelegate",
|
| + "actionId": "timeline.toggle-recording",
|
| + "iconClass": "largeicon-start-recording",
|
| + "toggledIconClass": "largeicon-stop-recording",
|
| + "toggleWithRedColor": true,
|
| + "contextTypes": [
|
| + "Timeline.TimelinePanel"
|
| + ],
|
| + "className": "Timeline.TimelinePanel.ActionDelegate",
|
| + "options": [
|
| {
|
| - "type": "view",
|
| - "location": "panel",
|
| - "id": "timeline",
|
| - "title": "Performance",
|
| - "order": 50,
|
| - "className": "Timeline.TimelinePanel"
|
| + "value": true,
|
| + "title": "Record"
|
| },
|
| {
|
| - "type": "setting",
|
| - "category": "Profiler",
|
| - "title": "Hide chrome frame in Layers view",
|
| - "settingName": "frameViewerHideChromeWindow",
|
| - "settingType": "boolean",
|
| - "defaultValue": false
|
| - },
|
| + "value": false,
|
| + "title": "Stop"
|
| + }
|
| + ],
|
| + "bindings": [
|
| {
|
| - "type": "@Common.QueryParamHandler",
|
| - "name": "loadTimelineFromURL",
|
| - "className": "Timeline.LoadTimelineHandler"
|
| + "platform": "windows,linux",
|
| + "shortcut": "Ctrl+E"
|
| },
|
| {
|
| - "type": "context-menu-item",
|
| - "location": "timelineMenu/open",
|
| - "actionId": "timeline.load-from-file"
|
| - },
|
| + "platform": "mac",
|
| + "shortcut": "Meta+E"
|
| + }
|
| + ]
|
| + },
|
| + {
|
| + "type": "@UI.ActionDelegate",
|
| + "category": "Timeline",
|
| + "actionId": "timeline.save-to-file",
|
| + "contextTypes": [
|
| + "Timeline.TimelinePanel"
|
| + ],
|
| + "className": "Timeline.TimelinePanel.ActionDelegate",
|
| + "title": "Save profileā¦",
|
| + "bindings": [
|
| {
|
| - "type": "context-menu-item",
|
| - "location": "timelineMenu/open",
|
| - "actionId": "timeline.save-to-file"
|
| + "platform": "windows,linux",
|
| + "shortcut": "Ctrl+S"
|
| },
|
| {
|
| - "type": "@UI.ActionDelegate",
|
| - "actionId": "timeline.toggle-recording",
|
| - "iconClass": "largeicon-start-recording",
|
| - "toggledIconClass": "largeicon-stop-recording",
|
| - "toggleWithRedColor": true,
|
| - "contextTypes": ["Timeline.TimelinePanel"],
|
| - "className": "Timeline.TimelinePanel.ActionDelegate",
|
| - "options": [
|
| - { "value": true, "title": "Record" },
|
| - { "value": false, "title": "Stop" }
|
| - ],
|
| - "bindings": [
|
| - {
|
| - "platform": "windows,linux",
|
| - "shortcut": "Ctrl+E"
|
| - },
|
| - {
|
| - "platform": "mac",
|
| - "shortcut": "Meta+E"
|
| - }
|
| - ]
|
| - },
|
| + "platform": "mac",
|
| + "shortcut": "Meta+S"
|
| + }
|
| + ]
|
| + },
|
| + {
|
| + "type": "@UI.ActionDelegate",
|
| + "category": "Timeline",
|
| + "actionId": "timeline.load-from-file",
|
| + "contextTypes": [
|
| + "Timeline.TimelinePanel"
|
| + ],
|
| + "order": "10",
|
| + "className": "Timeline.TimelinePanel.ActionDelegate",
|
| + "title": "Load profileā¦",
|
| + "bindings": [
|
| {
|
| - "type": "@UI.ActionDelegate",
|
| - "category": "Timeline",
|
| - "actionId": "timeline.save-to-file",
|
| - "contextTypes": ["Timeline.TimelinePanel"],
|
| - "className": "Timeline.TimelinePanel.ActionDelegate",
|
| - "title": "Save profile\u2026",
|
| - "bindings": [
|
| - {
|
| - "platform": "windows,linux",
|
| - "shortcut": "Ctrl+S"
|
| - },
|
| - {
|
| - "platform": "mac",
|
| - "shortcut": "Meta+S"
|
| - }
|
| - ]
|
| + "platform": "windows,linux",
|
| + "shortcut": "Ctrl+O"
|
| },
|
| {
|
| - "type": "@UI.ActionDelegate",
|
| - "category": "Timeline",
|
| - "actionId": "timeline.load-from-file",
|
| - "contextTypes": ["Timeline.TimelinePanel"],
|
| - "order": "10",
|
| - "className": "Timeline.TimelinePanel.ActionDelegate",
|
| - "title": "Load profile\u2026",
|
| - "bindings": [
|
| - {
|
| - "platform": "windows,linux",
|
| - "shortcut": "Ctrl+O"
|
| - },
|
| - {
|
| - "platform": "mac",
|
| - "shortcut": "Meta+O"
|
| - }
|
| - ]
|
| - },
|
| + "platform": "mac",
|
| + "shortcut": "Meta+O"
|
| + }
|
| + ]
|
| + },
|
| + {
|
| + "type": "@UI.ActionDelegate",
|
| + "actionId": "timeline.jump-to-previous-frame",
|
| + "contextTypes": [
|
| + "Timeline.TimelinePanel"
|
| + ],
|
| + "className": "Timeline.TimelinePanel.ActionDelegate",
|
| + "bindings": [
|
| {
|
| - "type": "@UI.ActionDelegate",
|
| - "actionId": "timeline.jump-to-previous-frame",
|
| - "contextTypes": ["Timeline.TimelinePanel"],
|
| - "className": "Timeline.TimelinePanel.ActionDelegate",
|
| - "bindings": [
|
| - {
|
| - "shortcut": "["
|
| - }
|
| - ]
|
| - },
|
| + "shortcut": "["
|
| + }
|
| + ]
|
| + },
|
| + {
|
| + "type": "@UI.ActionDelegate",
|
| + "actionId": "timeline.jump-to-next-frame",
|
| + "contextTypes": [
|
| + "Timeline.TimelinePanel"
|
| + ],
|
| + "className": "Timeline.TimelinePanel.ActionDelegate",
|
| + "bindings": [
|
| {
|
| - "type": "@UI.ActionDelegate",
|
| - "actionId": "timeline.jump-to-next-frame",
|
| - "contextTypes": ["Timeline.TimelinePanel"],
|
| - "className": "Timeline.TimelinePanel.ActionDelegate",
|
| - "bindings": [
|
| - {
|
| - "shortcut": "]"
|
| - }
|
| - ]
|
| + "shortcut": "]"
|
| }
|
| - ],
|
| - "dependencies": [
|
| - "components",
|
| - "components_lazy",
|
| - "layer_viewer",
|
| - "timeline_model",
|
| - "ui_lazy"
|
| - ],
|
| - "scripts": [
|
| - "CountersGraph.js",
|
| - "ExtensionTracingSession.js",
|
| - "MemoryCountersGraph.js",
|
| - "TimelineController.js",
|
| - "TimelineLoader.js",
|
| - "TimelineEventOverview.js",
|
| - "TimelineFlameChartView.js",
|
| - "TimelineFlameChart.js",
|
| - "TimelineNetworkFlameChart.js",
|
| - "TimelineTreeView.js",
|
| - "TimelineLandingPage.js",
|
| - "TimelineUIUtils.js",
|
| - "TimelineLayersView.js",
|
| - "TimelinePaintProfilerView.js",
|
| - "TimelinePanel.js"
|
| - ],
|
| - "resources": [
|
| - "invalidationsTree.css",
|
| - "timelineFlamechartPopover.css",
|
| - "timelineLandingPage.css",
|
| - "timelinePanel.css",
|
| - "timelinePaintProfiler.css",
|
| - "timelineStatusDialog.css"
|
| - ]
|
| -}
|
| + ]
|
| + }
|
| + ],
|
| + "dependencies": [
|
| + "components",
|
| + "layer_viewer",
|
| + "timeline_model",
|
| + "perf_ui",
|
| + "data_grid"
|
| + ],
|
| + "scripts": [
|
| + "CountersGraph.js",
|
| + "ExtensionTracingSession.js",
|
| + "MemoryCountersGraph.js",
|
| + "TimelineController.js",
|
| + "TimelineLoader.js",
|
| + "TimelineEventOverview.js",
|
| + "TimelineFlameChartView.js",
|
| + "TimelineFlameChart.js",
|
| + "TimelineNetworkFlameChart.js",
|
| + "TimelineTreeView.js",
|
| + "TimelineLandingPage.js",
|
| + "TimelineUIUtils.js",
|
| + "TimelineLayersView.js",
|
| + "TimelinePaintProfilerView.js",
|
| + "TimelinePanel.js"
|
| + ],
|
| + "resources": [
|
| + "invalidationsTree.css",
|
| + "timelineFlamechartPopover.css",
|
| + "timelineLandingPage.css",
|
| + "timelinePanel.css",
|
| + "timelinePaintProfiler.css",
|
| + "timelineStatusDialog.css"
|
| + ]
|
| +}
|
|
|