| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 eventStyles[recordTypes.Layout] = | 71 eventStyles[recordTypes.Layout] = |
| 72 new Timeline.TimelineRecordStyle(Common.UIString('Layout'), categories['
rendering']); | 72 new Timeline.TimelineRecordStyle(Common.UIString('Layout'), categories['
rendering']); |
| 73 eventStyles[recordTypes.PaintSetup] = | 73 eventStyles[recordTypes.PaintSetup] = |
| 74 new Timeline.TimelineRecordStyle(Common.UIString('Paint Setup'), categor
ies['painting']); | 74 new Timeline.TimelineRecordStyle(Common.UIString('Paint Setup'), categor
ies['painting']); |
| 75 eventStyles[recordTypes.PaintImage] = | 75 eventStyles[recordTypes.PaintImage] = |
| 76 new Timeline.TimelineRecordStyle(Common.UIString('Paint Image'), categor
ies['painting'], true); | 76 new Timeline.TimelineRecordStyle(Common.UIString('Paint Image'), categor
ies['painting'], true); |
| 77 eventStyles[recordTypes.UpdateLayer] = | 77 eventStyles[recordTypes.UpdateLayer] = |
| 78 new Timeline.TimelineRecordStyle(Common.UIString('Update Layer'), catego
ries['painting'], true); | 78 new Timeline.TimelineRecordStyle(Common.UIString('Update Layer'), catego
ries['painting'], true); |
| 79 eventStyles[recordTypes.UpdateLayerTree] = | 79 eventStyles[recordTypes.UpdateLayerTree] = |
| 80 new Timeline.TimelineRecordStyle(Common.UIString('Update Layer Tree'), c
ategories['rendering']); | 80 new Timeline.TimelineRecordStyle(Common.UIString('Update Layer Tree'), c
ategories['rendering']); |
| 81 eventStyles[recordTypes.PreparePaint] = |
| 82 new Timeline.TimelineRecordStyle(Common.UIString('Prepare Paint'), categ
ories['painting']); |
| 81 eventStyles[recordTypes.Paint] = new Timeline.TimelineRecordStyle(Common.UIS
tring('Paint'), categories['painting']); | 83 eventStyles[recordTypes.Paint] = new Timeline.TimelineRecordStyle(Common.UIS
tring('Paint'), categories['painting']); |
| 82 eventStyles[recordTypes.RasterTask] = | 84 eventStyles[recordTypes.RasterTask] = |
| 83 new Timeline.TimelineRecordStyle(Common.UIString('Rasterize Paint'), cat
egories['painting']); | 85 new Timeline.TimelineRecordStyle(Common.UIString('Rasterize Paint'), cat
egories['painting']); |
| 84 eventStyles[recordTypes.ScrollLayer] = | 86 eventStyles[recordTypes.ScrollLayer] = |
| 85 new Timeline.TimelineRecordStyle(Common.UIString('Scroll'), categories['
rendering']); | 87 new Timeline.TimelineRecordStyle(Common.UIString('Scroll'), categories['
rendering']); |
| 86 eventStyles[recordTypes.CompositeLayers] = | 88 eventStyles[recordTypes.CompositeLayers] = |
| 87 new Timeline.TimelineRecordStyle(Common.UIString('Composite Layers'), ca
tegories['painting']); | 89 new Timeline.TimelineRecordStyle(Common.UIString('Composite Layers'), ca
tegories['painting']); |
| 88 eventStyles[recordTypes.ParseHTML] = | 90 eventStyles[recordTypes.ParseHTML] = |
| 89 new Timeline.TimelineRecordStyle(Common.UIString('Parse HTML'), categori
es['loading']); | 91 new Timeline.TimelineRecordStyle(Common.UIString('Parse HTML'), categori
es['loading']); |
| 90 eventStyles[recordTypes.ParseAuthorStyleSheet] = | 92 eventStyles[recordTypes.ParseAuthorStyleSheet] = |
| (...skipping 2154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2245 /** | 2247 /** |
| 2246 * @param {!SDK.TracingModel.Event} event | 2248 * @param {!SDK.TracingModel.Event} event |
| 2247 * @param {string=} warningType | 2249 * @param {string=} warningType |
| 2248 */ | 2250 */ |
| 2249 appendWarningRow(event, warningType) { | 2251 appendWarningRow(event, warningType) { |
| 2250 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); | 2252 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); |
| 2251 if (warning) | 2253 if (warning) |
| 2252 this.appendElementRow(Common.UIString('Warning'), warning, true); | 2254 this.appendElementRow(Common.UIString('Warning'), warning, true); |
| 2253 } | 2255 } |
| 2254 }; | 2256 }; |
| OLD | NEW |