| OLD | NEW |
| 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 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 if (this._statusDialog) { | 870 if (this._statusDialog) { |
| 871 this._statusDialog.hide(); | 871 this._statusDialog.hide(); |
| 872 delete this._statusDialog; | 872 delete this._statusDialog; |
| 873 } | 873 } |
| 874 }, | 874 }, |
| 875 | 875 |
| 876 _setMarkers: function() | 876 _setMarkers: function() |
| 877 { | 877 { |
| 878 var markers = new Map(); | 878 var markers = new Map(); |
| 879 var recordTypes = WebInspector.TimelineModel.RecordType; | 879 var recordTypes = WebInspector.TimelineModel.RecordType; |
| 880 var zeroTime = this._model.minimumRecordTime(); |
| 880 for (var record of this._model.eventDividerRecords()) { | 881 for (var record of this._model.eventDividerRecords()) { |
| 881 if (record.type() === recordTypes.TimeStamp || record.type() === rec
ordTypes.ConsoleTime) | 882 if (record.type() === recordTypes.TimeStamp || record.type() === rec
ordTypes.ConsoleTime) |
| 882 continue; | 883 continue; |
| 883 markers.set(record.startTime(), WebInspector.TimelineUIUtils.createD
ividerForRecord(record, 0)); | 884 markers.set(record.startTime(), WebInspector.TimelineUIUtils.createD
ividerForRecord(record, zeroTime, 0)); |
| 884 } | 885 } |
| 885 this._overviewPane.setMarkers(markers); | 886 this._overviewPane.setMarkers(markers); |
| 886 }, | 887 }, |
| 887 | 888 |
| 888 /** | 889 /** |
| 889 * @param {!WebInspector.Event} event | 890 * @param {!WebInspector.Event} event |
| 890 */ | 891 */ |
| 891 _willReloadPage: function(event) | 892 _willReloadPage: function(event) |
| 892 { | 893 { |
| 893 if (this._operationInProgress || this._recordingInProgress() || !this.is
Showing()) | 894 if (this._operationInProgress || this._recordingInProgress() || !this.is
Showing()) |
| (...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1923 * @override | 1924 * @override |
| 1924 * @param {!WebInspector.Context} context | 1925 * @param {!WebInspector.Context} context |
| 1925 * @param {string} actionId | 1926 * @param {string} actionId |
| 1926 */ | 1927 */ |
| 1927 handleAction: function(context, actionId) | 1928 handleAction: function(context, actionId) |
| 1928 { | 1929 { |
| 1929 var panel = WebInspector.context.flavor(WebInspector.TimelinePanel); | 1930 var panel = WebInspector.context.flavor(WebInspector.TimelinePanel); |
| 1930 console.assert(panel && panel instanceof WebInspector.TimelinePanel); | 1931 console.assert(panel && panel instanceof WebInspector.TimelinePanel); |
| 1931 panel._toggleTimelineButtonClicked(); | 1932 panel._toggleTimelineButtonClicked(); |
| 1932 } | 1933 } |
| 1933 } | 1934 } |
| OLD | NEW |