Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1489)

Unified Diff: Source/devtools/front_end/timeline/TimelineFrameModel.js

Issue 715803002: DevTools: merge TracingTimelineModel into TimelineModel (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/timeline/TimelineFrameModel.js
diff --git a/Source/devtools/front_end/timeline/TimelineFrameModel.js b/Source/devtools/front_end/timeline/TimelineFrameModel.js
index e605a4cfaadebd6388f9ab182c3703048494cb19..13383635664f49c37353dba8fe66709e141ef267 100644
--- a/Source/devtools/front_end/timeline/TimelineFrameModel.js
+++ b/Source/devtools/front_end/timeline/TimelineFrameModel.js
@@ -223,10 +223,10 @@ WebInspector.TracingTimelineFrameModel = function()
}
WebInspector.TracingTimelineFrameModel._mainFrameMarkers = [
- WebInspector.TracingTimelineModel.RecordType.ScheduleStyleRecalculation,
- WebInspector.TracingTimelineModel.RecordType.InvalidateLayout,
- WebInspector.TracingTimelineModel.RecordType.BeginMainThreadFrame,
- WebInspector.TracingTimelineModel.RecordType.ScrollLayer
+ WebInspector.TimelineModel.RecordType.ScheduleStyleRecalculation,
+ WebInspector.TimelineModel.RecordType.InvalidateLayout,
+ WebInspector.TimelineModel.RecordType.BeginMainThreadFrame,
+ WebInspector.TimelineModel.RecordType.ScrollLayer
];
WebInspector.TracingTimelineFrameModel.prototype = {
@@ -250,7 +250,7 @@ WebInspector.TracingTimelineFrameModel.prototype = {
*/
_addTraceEvent: function(event)
{
- var eventNames = WebInspector.TracingTimelineModel.RecordType;
+ var eventNames = WebInspector.TimelineModel.RecordType;
if (event.name === eventNames.SetLayerTreeId) {
if (this._sessionId === event.args["sessionId"])
@@ -272,7 +272,7 @@ WebInspector.TracingTimelineFrameModel.prototype = {
*/
_addBackgroundTraceEvent: function(event)
{
- var eventNames = WebInspector.TracingTimelineModel.RecordType;
+ var eventNames = WebInspector.TimelineModel.RecordType;
if (event.phase === WebInspector.TracingModel.Phase.SnapshotObject && event.name === eventNames.LayerTreeHostImplSnapshot && parseInt(event.id, 0) === this._layerTreeId) {
var snapshot = /** @type {!WebInspector.TracingModel.ObjectSnapshot} */ (event);
this.handleLayerTreeSnapshot(new WebInspector.DeferredTracingLayerTree(snapshot));
@@ -300,7 +300,7 @@ WebInspector.TracingTimelineFrameModel.prototype = {
*/
_addMainThreadTraceEvent: function(event)
{
- var eventNames = WebInspector.TracingTimelineModel.RecordType;
+ var eventNames = WebInspector.TimelineModel.RecordType;
var timestamp = event.startTime;
var selfTime = event.selfTime || 0;

Powered by Google App Engine
This is Rietveld 408576698