| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 new Timeline.TimelineUIUtils.EventDispatchTypeDescriptor(3, purple, ['keyd
own', 'keyup', 'keypress']) | 1631 new Timeline.TimelineUIUtils.EventDispatchTypeDescriptor(3, purple, ['keyd
own', 'keyup', 'keypress']) |
| 1632 ]; | 1632 ]; |
| 1633 return Timeline.TimelineUIUtils._eventDispatchDesciptors; | 1633 return Timeline.TimelineUIUtils._eventDispatchDesciptors; |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 /** | 1636 /** |
| 1637 * @param {!SDK.TracingModel.Event} event | 1637 * @param {!SDK.TracingModel.Event} event |
| 1638 * @return {!Timeline.TimelineMarkerStyle} | 1638 * @return {!Timeline.TimelineMarkerStyle} |
| 1639 */ | 1639 */ |
| 1640 static markerStyleForEvent(event) { | 1640 static markerStyleForEvent(event) { |
| 1641 var red = 'rgb(255, 0, 0)'; | 1641 const red = 'rgb(255, 0, 0)'; |
| 1642 var blue = 'rgb(0, 0, 255)'; | 1642 const blue = 'rgb(0, 0, 255)'; |
| 1643 var orange = 'rgb(255, 178, 23)'; | 1643 const orange = 'rgb(255, 178, 23)'; |
| 1644 var green = 'rgb(0, 130, 0)'; | 1644 const green = 'rgb(0, 130, 0)'; |
| 1645 var tallMarkerDashStyle = [10, 5]; | 1645 const purple = '#a2f'; |
| 1646 | 1646 const tallMarkerDashStyle = [10, 5]; |
| 1647 var title = Timeline.TimelineUIUtils.eventTitle(event); | 1647 const title = Timeline.TimelineUIUtils.eventTitle(event); |
| 1648 | 1648 |
| 1649 if (event.hasCategory(TimelineModel.TimelineModel.Category.Console) || | 1649 if (event.hasCategory(TimelineModel.TimelineModel.Category.Console) || |
| 1650 event.hasCategory(TimelineModel.TimelineModel.Category.UserTiming)) { | 1650 event.hasCategory(TimelineModel.TimelineModel.Category.UserTiming)) { |
| 1651 return { | 1651 return { |
| 1652 title: title, | 1652 title: title, |
| 1653 dashStyle: tallMarkerDashStyle, | 1653 dashStyle: tallMarkerDashStyle, |
| 1654 lineWidth: 0.5, | 1654 lineWidth: 0.5, |
| 1655 color: orange, | 1655 color: orange, |
| 1656 tall: false, | 1656 tall: false, |
| 1657 lowPriority: false, | 1657 lowPriority: false, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1669 color = red; | 1669 color = red; |
| 1670 tall = true; | 1670 tall = true; |
| 1671 break; | 1671 break; |
| 1672 case recordTypes.MarkFirstPaint: | 1672 case recordTypes.MarkFirstPaint: |
| 1673 color = green; | 1673 color = green; |
| 1674 tall = true; | 1674 tall = true; |
| 1675 break; | 1675 break; |
| 1676 case recordTypes.TimeStamp: | 1676 case recordTypes.TimeStamp: |
| 1677 color = orange; | 1677 color = orange; |
| 1678 break; | 1678 break; |
| 1679 case recordTypes.FMPCandidate: |
| 1680 color = purple; |
| 1681 break; |
| 1679 } | 1682 } |
| 1680 return { | 1683 return { |
| 1681 title: title, | 1684 title: title, |
| 1682 dashStyle: tallMarkerDashStyle, | 1685 dashStyle: tallMarkerDashStyle, |
| 1683 lineWidth: 0.5, | 1686 lineWidth: 0.5, |
| 1684 color: color, | 1687 color: color, |
| 1685 tall: tall, | 1688 tall: tall, |
| 1686 lowPriority: false, | 1689 lowPriority: false, |
| 1687 }; | 1690 }; |
| 1688 } | 1691 } |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2241 /** | 2244 /** |
| 2242 * @param {!SDK.TracingModel.Event} event | 2245 * @param {!SDK.TracingModel.Event} event |
| 2243 * @param {string=} warningType | 2246 * @param {string=} warningType |
| 2244 */ | 2247 */ |
| 2245 appendWarningRow(event, warningType) { | 2248 appendWarningRow(event, warningType) { |
| 2246 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); | 2249 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); |
| 2247 if (warning) | 2250 if (warning) |
| 2248 this.appendElementRow(Common.UIString('Warning'), warning, true); | 2251 this.appendElementRow(Common.UIString('Warning'), warning, true); |
| 2249 } | 2252 } |
| 2250 }; | 2253 }; |
| OLD | NEW |