Skip to content

GitLab

T
tangled
Commit b61b7b83 authored by yurys@chromium.org's avatar yurys@chromium.org
Browse files
Options

Delete TimelineTracingView 

Now that corresponding experiment was removed there is no way to see the view. Also removing TimelineFlameChartDataProvider which is not used in tracing based Timeline and we don't show flame chart in other modes.

BUG=361045,394762
R=alph@chromium.org

Review URL: https://codereview.chromium.org/402653002

git-svn-id: svn://svn.chromium.org/blink/trunk@178425 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a5d22a16
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 1054 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ b61b7b83
......@@ -1264,6 +1264,9 @@ crbug.com/390204 [ Release ] inspector/console/console-viewport-selection.html [
crbug.com/390204 [ Debug ] inspector/console/console-viewport-selection.html [ Pass Failure Slow ]
crbug.com/394208 [ Win ] http/tests/security/link-crossorigin-stylesheet-use-credentials.html [ Timeout Pass ]
crbug.com/394210 [ Win ] inspector/profiler/webgl/webgl-profiler-api-changes.html [ Timeout Pass ]
crbug.com/394762 inspector/timeline/timeline-flame-chart-automatically-size-window.html [ Skip ]
crbug.com/394762 virtual/deferred/inspector/timeline/timeline-flame-chart-automatically-size-window.html [ Skip ]
crbug.com/394762 virtual/implsidepainting/inspector/timeline/timeline-flame-chart-automatically-size-window.html [ Skip ]
# Assertion failures seen only on Slow Leopard.
crbug.com/374961 [ SnowLeopard Debug ] inspector/sources/debugger/frameworks-skip-step-in.html [ Crash ]
......
third_party/WebKit/LayoutTests/inspector/timeline/timeline-window-filter-expected.txt
View file @ b61b7b83
......@@ -43,21 +43,6 @@ time range = 1390988669535.377 - 1390988670098.158
records count: 38
divider offsets: [500, 600, 700, 800, 900, 1000]. We are expecting round numbers.
mode = Frames
range = 0 - 1
time range = 1390988669115.4338 - 1390988670116.917
divider offsets: [200, 400, 600, 800, 1000]. We are expecting round numbers.
mode = Frames
range = 0.25 - 0.5
time range = 1390988669438.409 - 1390988669752.828
divider offsets: [350, 400, 450, 500, 550, 600]. We are expecting round numbers.
mode = Frames
range = 0.33 - 0.4
time range = 1390988669535.377 - 1390988669648.884
divider offsets: [440, 460, 480, 500, 520]. We are expecting round numbers.
--------------------------------------------------------
mode = Frames
time range = 1390988669264.497 - 1390988670098.158
......
third_party/WebKit/LayoutTests/inspector/timeline/timeline-window-filter.html
View file @ b61b7b83
......@@ -78,9 +78,10 @@ function test()
timeline._overviewModeSetting.set(WebInspector.TimelinePanel.OverviewMode.Frames);
timeline._flameChartEnabledSetting.set(true);
timeline._onModeChanged();
dumpFlameChartRecordsCountForRange(0, 1);
dumpFlameChartRecordsCountForRange(0.25, 0.5);
dumpFlameChartRecordsCountForRange(0.33, 0.4);
// FIXME(394762): uncomment once we support loading tracing events.
// dumpFlameChartRecordsCountForRange(0, 1);
// dumpFlameChartRecordsCountForRange(0.25, 0.5);
// dumpFlameChartRecordsCountForRange(0.33, 0.4);
overviewPane._overviewGrid.setWindow(0.1, 0.9);
......
third_party/WebKit/Source/devtools/devtools.gypi
View file @ b61b7b83
......@@ -404,7 +404,6 @@
'front_end/timeline/TimelinePowerGraph.js',
'front_end/timeline/TimelinePowerOverview.js',
'front_end/timeline/TimelinePanel.js',
'front_end/timeline/TimelineTracingView.js',
'front_end/timeline/TimelineLayersView.js',
'front_end/timeline/TracingModel.js',
'front_end/timeline/TracingTimelineModel.js',
......
third_party/WebKit/Source/devtools/front_end/timeline/TimelinePanel.js
View file @ b61b7b83
......@@ -48,7 +48,6 @@ importScript("TimelineFlameChart.js");
importScript("TimelineUIUtils.js");
importScript("TimelineUIUtilsImpl.js");
importScript("TimelineView.js");
importScript("TimelineTracingView.js");
importScript("TimelineLayersView.js");
importScript("TimelinePaintProfilerView.js");
importScript("TracingModel.js");
......@@ -644,12 +643,10 @@ WebInspector.TimelinePanel.prototype = {
else
this._overviewControls.push(new WebInspector.TimelineEventOverview(this._model, this._uiUtils));
if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() && this._flameChartEnabledSetting.get()) {
var tracingTimelineModel = WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled() ? this._tracingTimelineModel : null;
this._addModeView(new WebInspector.TimelineFlameChart(this, this._model, tracingTimelineModel, this._frameModel(), this._uiUtils));
} else {
if (this._tracingTimelineModel && this._flameChartEnabledSetting.get())
this._addModeView(new WebInspector.TimelineFlameChart(this, this._tracingTimelineModel, this._frameModel()));
else
this._addModeView(this._timelineView());
}
if (this._captureMemorySetting.get()) {
if (!isFrameMode) // Frame mode skews time, don't render aux overviews.
......@@ -663,9 +660,6 @@ WebInspector.TimelinePanel.prototype = {
this._addModeView(new WebInspector.TimelinePowerGraph(this, this._model));
}
if (this._captureTracingSetting && this._captureTracingSetting.get())
this._addModeView(new WebInspector.TimelineTracingView(this, this._tracingModel, this._model));
if (this._lazyTimelineView)
this._lazyTimelineView.setFrameModel(isFrameMode ? this._frameModel() : null);
......
third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
View file @ b61b7b83
......@@ -166,14 +166,6 @@ WebInspector.TimelineUIUtils.prototype = {
hiddenEmptyRecordsFilter: function()
{
return null;
},
/**
* @param {!WebInspector.TimelineModel} model
* @return {!WebInspector.TimelineModel.Record}
*/
createProgramRecord: function(model)
{
throw new Error("Not implemented.");
}
}
......
third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtilsImpl.js
View file @ b61b7b83
......@@ -176,16 +176,6 @@ WebInspector.TimelineUIUtilsImpl.prototype = {
return new WebInspector.TimelineRecordHiddenTypeFilter(hiddenRecords);
},
/**
* @param {!WebInspector.TimelineModel} model
* @return {!WebInspector.TimelineModel.Record}
*/
createProgramRecord: function(model)
{
var payloadEvent = { type: WebInspector.TimelineModel.RecordType.Program };
return new WebInspector.TimelineModel.RecordImpl(model, /** @type {!TimelineAgent.TimelineEvent} */ (payloadEvent), null);
},
__proto__: WebInspector.TimelineUIUtils.prototype
}
......
third_party/WebKit/Source/devtools/front_end/timeline/TracingTimelineUIUtils.js
View file @ b61b7b83
......@@ -174,16 +174,6 @@ WebInspector.TracingTimelineUIUtils.prototype = {
return new WebInspector.TimelineRecordHiddenEmptyTypeFilter(hiddenEmptyRecords);
},
/**
* @param {!WebInspector.TimelineModel} model
* @return {!WebInspector.TimelineModel.Record}
*/
createProgramRecord: function(model)
{
var payload = { name: WebInspector.TracingTimelineModel.RecordType.Program };
return new WebInspector.TracingTimelineModel.TraceEventRecord(model, new WebInspector.TracingModel.Event(/** @type {!WebInspector.TracingModel.EventPayload} */ (payload), 0, null));
},
__proto__: WebInspector.TimelineUIUtils.prototype
}
......
third_party/WebKit/Source/devtools/scripts/frontend_modules.json
View file @ b61b7b83
......@@ -325,7 +325,6 @@
"timeline/TimelineUIUtilsImpl.js",
"timeline/TimelineView.js",
"timeline/TimelinePaintProfilerView.js",
"timeline/TimelineTracingView.js",
"timeline/TimelineLayersView.js",
"timeline/TracingModel.js",
"timeline/TracingTimelineUIUtils.js",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment