summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcaseq <caseq@chromium.org>2016-03-18 19:48:16 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-19 02:49:45 +0000
commitd9a19e639efa937e738d768568ac180667b834be (patch)
tree5e8af5c02b911a7885e56614b414789b33a837af
parentf6cac8c2524beae96fbc7bf3e037a2f2c6302a2b (diff)
downloadchromium_src-d9a19e639efa937e738d768568ac180667b834be.zip
chromium_src-d9a19e639efa937e738d768568ac180667b834be.tar.gz
chromium_src-d9a19e639efa937e738d768568ac180667b834be.tar.bz2
Timeline: get RAIL strip out of experiment
Animations and Input Latencies remain under experiment still. BUG=554215 Review URL: https://codereview.chromium.org/1811993002 Cr-Commit-Position: refs/heads/master@{#382173}
-rw-r--r--third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing-expected.txt46
-rw-r--r--third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing.html2
-rw-r--r--third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js3
-rw-r--r--third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js18
-rw-r--r--third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js4
-rw-r--r--third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js6
-rw-r--r--third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js2
7 files changed, 40 insertions, 41 deletions
diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing-expected.txt
index 3eda3fa..49fa1d4 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing-expected.txt
@@ -1,28 +1,28 @@
Blackboxed url: lib_script.js
-level1: 10 @ 208
- level2: 10 @ 208
- level3: 1 @ 209
- Blackboxed: 6 @ 211
- level4user: 1 @ 211
- level6user: 3 @ 213
- Blackboxed: 3 @ 213
- level8user: 3 @ 213
-Blackboxed: 3 @ 230
-Blackboxed: 3 @ 235
+ level1: 10 @ 208
+ level2: 10 @ 208
+ level3: 1 @ 209
+ Blackboxed: 6 @ 211
+ level4user: 1 @ 211
+ level6user: 3 @ 213
+ Blackboxed: 3 @ 213
+ level8user: 3 @ 213
+ Blackboxed: 3 @ 230
+ Blackboxed: 3 @ 235
Unblackboxed url: lib_script.js
-level1: 10 @ 208
- level2: 10 @ 208
- level3: 1 @ 209
- level3blackboxed: 6 @ 211
- level4user: 1 @ 211
- level4blackboxed: 3 @ 213
- level5blackboxed: 3 @ 213
- level6user: 3 @ 213
- level7blackboxed: 3 @ 213
- level8user: 3 @ 213
-level1blackboxed: 3 @ 230
-level1blackboxed: 3 @ 235
- level2blackboxed: 1 @ 236
+ level1: 10 @ 208
+ level2: 10 @ 208
+ level3: 1 @ 209
+ level3blackboxed: 6 @ 211
+ level4user: 1 @ 211
+ level4blackboxed: 3 @ 213
+ level5blackboxed: 3 @ 213
+ level6user: 3 @ 213
+ level7blackboxed: 3 @ 213
+ level8user: 3 @ 213
+ level1blackboxed: 3 @ 230
+ level1blackboxed: 3 @ 235
+ level2blackboxed: 1 @ 236
diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing.html b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing.html
index cd62986..cb2fa41 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing.html
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-js-blackboxing.html
@@ -284,7 +284,7 @@ function test()
Runtime.experiments.enableForTest("blackboxJSFramesOnTimeline");
var timelineModel = InspectorTest.createTimelineModelWithEvents(rawTraceEvents);
- var dataProvider = new WebInspector.TimelineFlameChartDataProvider(timelineModel, new WebInspector.TracingTimelineFrameModel());
+ var dataProvider = new WebInspector.TimelineFlameChartDataProvider(timelineModel, new WebInspector.TracingTimelineFrameModel(), new WebInspector.TimelineIRModel());
InspectorTest.addResult("\nBlackboxed url: lib_script.js");
WebInspector.blackboxManager._blackboxURL("lib_script.js");
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js
index 76c875c..3ce1bc2 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js
@@ -44,8 +44,7 @@ WebInspector.TimelineController.prototype = {
WebInspector.TimelineModel.Category.Console,
WebInspector.TimelineModel.Category.UserTiming
];
- if (Runtime.experiments.isEnabled("timelineLatencyInfo"))
- categoriesArray.push(WebInspector.TimelineModel.Category.LatencyInfo)
+ categoriesArray.push(WebInspector.TimelineModel.Category.LatencyInfo)
if (Runtime.experiments.isEnabled("timelineFlowEvents")) {
categoriesArray.push(disabledByDefault("toplevel.flow"),
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js
index d700861..aa80554 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js
@@ -272,7 +272,7 @@ WebInspector.TimelineFlameChartEntryType = {
* @extends {WebInspector.TimelineFlameChartDataProviderBase}
* @param {!WebInspector.TimelineModel} model
* @param {!WebInspector.TimelineFrameModelBase} frameModel
- * @param {?WebInspector.TimelineIRModel} irModel
+ * @param {!WebInspector.TimelineIRModel} irModel
*/
WebInspector.TimelineFlameChartDataProvider = function(model, frameModel, irModel)
{
@@ -506,10 +506,16 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {
*/
_appendAsyncEvents: function(asyncEvents)
{
- var groups = Object.values(WebInspector.TimelineUIUtils.asyncEventGroups());
+ var groups = WebInspector.TimelineUIUtils.asyncEventGroups();
+ var groupArray = Object.values(groups);
- for (var groupIndex = 0; groupIndex < groups.length; ++groupIndex) {
- var group = groups[groupIndex];
+ if (!Runtime.experiments.isEnabled("timelineLatencyInfo")) {
+ groupArray.remove(groups.animation);
+ groupArray.remove(groups.input);
+ }
+
+ for (var groupIndex = 0; groupIndex < groupArray.length; ++groupIndex) {
+ var group = groupArray[groupIndex];
var events = asyncEvents.get(group);
if (events)
this._appendAsyncEventsGroup(group.title, events);
@@ -551,8 +557,6 @@ WebInspector.TimelineFlameChartDataProvider.prototype = {
_appendInteractionRecords: function()
{
- if (!this._irModel)
- return;
this._irModel.interactionRecords().forEach(this._appendSegment, this);
this._entryTypeByLevel[this._currentLevel++] = WebInspector.TimelineFlameChartEntryType.InteractionRecord;
},
@@ -1238,7 +1242,7 @@ WebInspector.TimelineFlameChartMarker.prototype = {
* @param {!WebInspector.TimelineModeViewDelegate} delegate
* @param {!WebInspector.TimelineModel} timelineModel
* @param {!WebInspector.TimelineFrameModelBase} frameModel
- * @param {?WebInspector.TimelineIRModel} irModel
+ * @param {!WebInspector.TimelineIRModel} irModel
*/
WebInspector.TimelineFlameChartView = function(delegate, timelineModel, frameModel, irModel)
{
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js
index 88edc1f..1f67829 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js
@@ -1009,8 +1009,6 @@ WebInspector.TimelineModel.prototype = {
return groups.console;
if (asyncEvent.hasCategory(WebInspector.TimelineModel.Category.UserTiming))
return groups.userTiming;
- if (!Runtime.experiments.isEnabled("timelineLatencyInfo"))
- return null;
if (asyncEvent.name === WebInspector.TimelineModel.RecordType.Animation)
return groups.animation;
if (asyncEvent.hasCategory(WebInspector.TimelineModel.Category.LatencyInfo) || asyncEvent.name === WebInspector.TimelineModel.RecordType.ImplSideFling) {
@@ -1778,4 +1776,4 @@ WebInspector.TimelineModel.LineLevelProfile.prototype = {
{
return this._files;
}
-} \ No newline at end of file
+}
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js
index 3df0675..b4d1109 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js
@@ -55,8 +55,7 @@ WebInspector.TimelinePanel = function()
this._tracingModel = new WebInspector.TracingModel(this._tracingModelBackingStorage);
this._model = new WebInspector.TimelineModel(WebInspector.TimelineUIUtils.visibleEventsFilter());
this._frameModel = new WebInspector.TracingTimelineFrameModel();
- if (Runtime.experiments.isEnabled("timelineLatencyInfo"))
- this._irModel = new WebInspector.TimelineIRModel();
+ this._irModel = new WebInspector.TimelineIRModel();
if (Runtime.experiments.isEnabled("cpuThrottling"))
this._cpuThrottlingManager = new WebInspector.CPUThrottlingManager();
@@ -808,8 +807,7 @@ WebInspector.TimelinePanel.prototype = {
this._model.setEvents(this._tracingModel, loadedFromFile);
this._frameModel.reset();
this._frameModel.addTraceEvents(this._model.target(), this._model.inspectedTargetEvents(), this._model.sessionId() || "");
- if (this._irModel)
- this._irModel.populate(this._model);
+ this._irModel.populate(this._model);
this._setLineLevelCPUProfile(this._model.lineLevelCPUProfile());
if (this._statusPane)
this._statusPane.hide();
diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
index d1a74d2..8cc41a4 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
@@ -2139,4 +2139,4 @@ WebInspector.TimelineUIUtils.PerformanceLineDecorator.prototype = {
textEditor.setGutterDecoration(decoration.line(), decoration.type(), element);
}
}
-} \ No newline at end of file
+}