| 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 1436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1447 'scripting', Common.UIString('Scripting'), true, 'hsl(43, 83%, 72%)',
'hsl(43, 83%, 64%) '), | 1447 'scripting', Common.UIString('Scripting'), true, 'hsl(43, 83%, 72%)',
'hsl(43, 83%, 64%) '), |
| 1448 rendering: new Timeline.TimelineCategory( | 1448 rendering: new Timeline.TimelineCategory( |
| 1449 'rendering', Common.UIString('Rendering'), true, 'hsl(256, 67%, 76%)',
'hsl(256, 67%, 70%)'), | 1449 'rendering', Common.UIString('Rendering'), true, 'hsl(256, 67%, 76%)',
'hsl(256, 67%, 70%)'), |
| 1450 painting: new Timeline.TimelineCategory( | 1450 painting: new Timeline.TimelineCategory( |
| 1451 'painting', Common.UIString('Painting'), true, 'hsl(109, 33%, 64%)', '
hsl(109, 33%, 55%)'), | 1451 'painting', Common.UIString('Painting'), true, 'hsl(109, 33%, 64%)', '
hsl(109, 33%, 55%)'), |
| 1452 gpu: new Timeline.TimelineCategory( | 1452 gpu: new Timeline.TimelineCategory( |
| 1453 'gpu', Common.UIString('GPU'), false, 'hsl(109, 33%, 64%)', 'hsl(109,
33%, 55%)'), | 1453 'gpu', Common.UIString('GPU'), false, 'hsl(109, 33%, 64%)', 'hsl(109,
33%, 55%)'), |
| 1454 other: | 1454 other: |
| 1455 new Timeline.TimelineCategory('other', Common.UIString('Other'), false
, 'hsl(0, 0%, 87%)', 'hsl(0, 0%, 79%)'), | 1455 new Timeline.TimelineCategory('other', Common.UIString('Other'), false
, 'hsl(0, 0%, 87%)', 'hsl(0, 0%, 79%)'), |
| 1456 idle: new Timeline.TimelineCategory( | 1456 idle: new Timeline.TimelineCategory( |
| 1457 'idle', Common.UIString('Idle'), false, 'hsl(0, 100%, 100%)', 'hsl(0,
100%, 100%)') | 1457 'idle', Common.UIString('Idle'), false, 'hsl(0, 0%, 98%)', 'hsl(0, 0%,
98%)') |
| 1458 }; | 1458 }; |
| 1459 return Timeline.TimelineUIUtils._categories; | 1459 return Timeline.TimelineUIUtils._categories; |
| 1460 } | 1460 } |
| 1461 | 1461 |
| 1462 /** | 1462 /** |
| 1463 * @param {!TimelineModel.TimelineModel.AsyncEventGroup} group | 1463 * @param {!TimelineModel.TimelineModel.AsyncEventGroup} group |
| 1464 * @return {string} | 1464 * @return {string} |
| 1465 */ | 1465 */ |
| 1466 static titleForAsyncEventGroup(group) { | 1466 static titleForAsyncEventGroup(group) { |
| 1467 if (!Timeline.TimelineUIUtils._titleForAsyncEventGroupMap) { | 1467 if (!Timeline.TimelineUIUtils._titleForAsyncEventGroupMap) { |
| (...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2273 * @param {string=} warningType | 2273 * @param {string=} warningType |
| 2274 */ | 2274 */ |
| 2275 appendWarningRow(event, warningType) { | 2275 appendWarningRow(event, warningType) { |
| 2276 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); | 2276 var warning = Timeline.TimelineUIUtils.eventWarning(event, warningType); |
| 2277 if (warning) | 2277 if (warning) |
| 2278 this.appendElementRow(Common.UIString('Warning'), warning, true); | 2278 this.appendElementRow(Common.UIString('Warning'), warning, true); |
| 2279 } | 2279 } |
| 2280 }; | 2280 }; |
| 2281 | 2281 |
| 2282 Timeline.TimelineUIUtils._categoryBreakdownCacheSymbol = Symbol('categoryBreakdo
wnCache'); | 2282 Timeline.TimelineUIUtils._categoryBreakdownCacheSymbol = Symbol('categoryBreakdo
wnCache'); |
| OLD | NEW |