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

Side by Side Diff: Source/devtools/front_end/timeline/TimelinePanel.js

Issue 402633002: DevTools: Remove redundant dependency on target from TimelineFrameModel (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2012 Intel Inc. All rights reserved. 3 * Copyright (C) 2012 Intel Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 }, 255 },
256 256
257 /** 257 /**
258 * @return {!WebInspector.TimelineFrameModelBase} 258 * @return {!WebInspector.TimelineFrameModelBase}
259 */ 259 */
260 _frameModel: function() 260 _frameModel: function()
261 { 261 {
262 if (this._lazyFrameModel) 262 if (this._lazyFrameModel)
263 return this._lazyFrameModel; 263 return this._lazyFrameModel;
264 if (this._tracingModel) { 264 if (this._tracingModel) {
265 var tracingFrameModel = new WebInspector.TracingTimelineFrameModel(t his._model.target()); 265 var tracingFrameModel = new WebInspector.TracingTimelineFrameModel() ;
266 tracingFrameModel.addTraceEvents(this._tracingTimelineModel.inspecte dTargetEvents(), this._tracingModel.sessionId() || ""); 266 tracingFrameModel.addTraceEvents(this._tracingTimelineModel.inspecte dTargetEvents(), this._tracingModel.sessionId() || "");
267 this._lazyFrameModel = tracingFrameModel; 267 this._lazyFrameModel = tracingFrameModel;
268 } else { 268 } else {
269 var frameModel = new WebInspector.TimelineFrameModel(this._model.tar get()); 269 var frameModel = new WebInspector.TimelineFrameModel();
270 frameModel.setMergeRecords(!WebInspector.experimentsSettings.timelin eNoLiveUpdate.isEnabled() || !this._recordingInProgress); 270 frameModel.setMergeRecords(!WebInspector.experimentsSettings.timelin eNoLiveUpdate.isEnabled() || !this._recordingInProgress);
271 frameModel.addRecords(this._model.records()); 271 frameModel.addRecords(this._model.records());
272 this._lazyFrameModel = frameModel; 272 this._lazyFrameModel = frameModel;
273 } 273 }
274 return this._lazyFrameModel; 274 return this._lazyFrameModel;
275 }, 275 },
276 276
277 /** 277 /**
278 * @return {!WebInspector.TimelineView} 278 * @return {!WebInspector.TimelineView}
279 */ 279 */
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 * @param {!WebInspector.TimelineModel.Record} record 1477 * @param {!WebInspector.TimelineModel.Record} record
1478 * @return {boolean} 1478 * @return {boolean}
1479 */ 1479 */
1480 accept: function(record) 1480 accept: function(record)
1481 { 1481 {
1482 return !this._regex || this._uiUtils.testContentMatching(record, this._r egex); 1482 return !this._regex || this._uiUtils.testContentMatching(record, this._r egex);
1483 }, 1483 },
1484 1484
1485 __proto__: WebInspector.TimelineModel.Filter.prototype 1485 __proto__: WebInspector.TimelineModel.Filter.prototype
1486 } 1486 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698