| 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 967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 978 performSearch: function(searchConfig, shouldJump, jumpBackwards) | 978 performSearch: function(searchConfig, shouldJump, jumpBackwards) |
| 979 { | 979 { |
| 980 var query = searchConfig.query; | 980 var query = searchConfig.query; |
| 981 this._searchRegex = createPlainTextSearchRegex(query, "i"); | 981 this._searchRegex = createPlainTextSearchRegex(query, "i"); |
| 982 delete this._searchResults; | 982 delete this._searchResults; |
| 983 this._updateSearchHighlight(true, shouldJump, jumpBackwards); | 983 this._updateSearchHighlight(true, shouldJump, jumpBackwards); |
| 984 }, | 984 }, |
| 985 | 985 |
| 986 _updateSelectionDetails: function() | 986 _updateSelectionDetails: function() |
| 987 { | 987 { |
| 988 if (!this._selection) | 988 if (!this._selection) { |
| 989 this._selection = WebInspector.TimelineSelection.fromRange(this._win
dowStartTime, this._windowEndTime); | 989 if (this._tracingTimelineModel && this._flameChartEnabledSetting.get
()) { |
| 990 this.showInDetails(this.element.ownerDocument.createElement("di
v")); |
| 991 return; |
| 992 } else { |
| 993 this._selection = WebInspector.TimelineSelection.fromRange(this
._windowStartTime, this._windowEndTime); |
| 994 } |
| 995 } |
| 990 | 996 |
| 991 switch (this._selection.type()) { | 997 switch (this._selection.type()) { |
| 992 case WebInspector.TimelineSelection.Type.Record: | 998 case WebInspector.TimelineSelection.Type.Record: |
| 993 var record = /** @type {!WebInspector.TimelineModel.Record} */ (this
._selection.object()); | 999 var record = /** @type {!WebInspector.TimelineModel.Record} */ (this
._selection.object()); |
| 994 if (this._tracingTimelineModel) { | 1000 if (this._tracingTimelineModel) { |
| 995 var event = record.traceEvent(); | 1001 var event = record.traceEvent(); |
| 996 this._uiUtils.generateDetailsContent(record, this._model, this._
detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this,
event)); | 1002 this._uiUtils.generateDetailsContent(record, this._model, this._
detailsLinkifier, this._appendDetailsTabsForTraceEventAndShowDetails.bind(this,
event)); |
| 997 break; | 1003 break; |
| 998 } | 1004 } |
| 999 this._uiUtils.generateDetailsContent(record, this._model, this._deta
ilsLinkifier, this.showInDetails.bind(this)); | 1005 this._uiUtils.generateDetailsContent(record, this._model, this._deta
ilsLinkifier, this.showInDetails.bind(this)); |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1520 | 1526 |
| 1521 WebInspector.TimelinePanelFactory.prototype = { | 1527 WebInspector.TimelinePanelFactory.prototype = { |
| 1522 /** | 1528 /** |
| 1523 * @return {!WebInspector.Panel} | 1529 * @return {!WebInspector.Panel} |
| 1524 */ | 1530 */ |
| 1525 createPanel: function() | 1531 createPanel: function() |
| 1526 { | 1532 { |
| 1527 return WebInspector.TimelinePanel._instance(); | 1533 return WebInspector.TimelinePanel._instance(); |
| 1528 } | 1534 } |
| 1529 } | 1535 } |
| OLD | NEW |