Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Side by Side Diff: Source/devtools/front_end/timeline/TimelineUIUtils.js

Issue 1211613002: Timeline: check category presence in list, not string equality (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed tracing-session-id.html Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineModel.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 return WebInspector.TimelineUIUtils.eventStyle(record.traceEvent()).category ; 163 return WebInspector.TimelineUIUtils.eventStyle(record.traceEvent()).category ;
164 } 164 }
165 165
166 /** 166 /**
167 * @param {!WebInspector.TracingModel.Event} event 167 * @param {!WebInspector.TracingModel.Event} event
168 * @return {!{title: string, category: !WebInspector.TimelineCategory}} 168 * @return {!{title: string, category: !WebInspector.TimelineCategory}}
169 */ 169 */
170 WebInspector.TimelineUIUtils.eventStyle = function(event) 170 WebInspector.TimelineUIUtils.eventStyle = function(event)
171 { 171 {
172 var eventStyles = WebInspector.TimelineUIUtils._initEventStyles(); 172 var eventStyles = WebInspector.TimelineUIUtils._initEventStyles();
173 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) 173 if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
174 return { title: event.name, category: WebInspector.TimelineUIUtils.categ ories()["scripting"] }; 174 return { title: event.name, category: WebInspector.TimelineUIUtils.categ ories()["scripting"] };
175 175
176 var result = eventStyles[event.name]; 176 var result = eventStyles[event.name];
177 if (!result) { 177 if (!result) {
178 result = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Unk nown: %s", event.name), WebInspector.TimelineUIUtils.categories()["other"], tru e); 178 result = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Unk nown: %s", event.name), WebInspector.TimelineUIUtils.categories()["other"], tru e);
179 eventStyles[event.name] = result; 179 eventStyles[event.name] = result;
180 } 180 }
181 return result; 181 return result;
182 } 182 }
183 183
184 /** 184 /**
185 * @param {!WebInspector.TracingModel.Event} event 185 * @param {!WebInspector.TracingModel.Event} event
186 * @return {string} 186 * @return {string}
187 */ 187 */
188 WebInspector.TimelineUIUtils.eventTitle = function(event) 188 WebInspector.TimelineUIUtils.eventTitle = function(event)
189 { 189 {
190 var title = WebInspector.TimelineUIUtils.eventStyle(event).title; 190 var title = WebInspector.TimelineUIUtils.eventStyle(event).title;
191 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) 191 if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
192 return title; 192 return title;
193 if (event.name === WebInspector.TimelineModel.RecordType.TimeStamp) 193 if (event.name === WebInspector.TimelineModel.RecordType.TimeStamp)
194 return WebInspector.UIString("%s: %s", title, event.args["data"]["messag e"]); 194 return WebInspector.UIString("%s: %s", title, event.args["data"]["messag e"]);
195 if (event.name === WebInspector.TimelineModel.RecordType.Animation && event. args["data"] && event.args["data"]["name"]) 195 if (event.name === WebInspector.TimelineModel.RecordType.Animation && event. args["data"] && event.args["data"]["name"])
196 return WebInspector.UIString("%s: %s", title, event.args["data"]["name"] ); 196 return WebInspector.UIString("%s: %s", title, event.args["data"]["name"] );
197 return title; 197 return title;
198 } 198 }
199 199
200 /** 200 /**
201 * @param {!WebInspector.TracingModel.Event} event 201 * @param {!WebInspector.TracingModel.Event} event
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 var url = event.url; 304 var url = event.url;
305 if (url) 305 if (url)
306 detailsText = WebInspector.displayNameForURL(url); 306 detailsText = WebInspector.displayNameForURL(url);
307 break; 307 break;
308 308
309 case recordType.Animation: 309 case recordType.Animation:
310 detailsText = eventData && eventData["name"]; 310 detailsText = eventData && eventData["name"];
311 break; 311 break;
312 312
313 default: 313 default:
314 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) 314 if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
315 detailsText = null; 315 detailsText = null;
316 else 316 else
317 detailsText = linkifyTopCallFrameAsText(); 317 detailsText = linkifyTopCallFrameAsText();
318 break; 318 break;
319 } 319 }
320 320
321 return detailsText; 321 return detailsText;
322 322
323 /** 323 /**
324 * @param {string} scriptId 324 * @param {string} scriptId
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 case recordType.UpdateLayoutTree: 415 case recordType.UpdateLayoutTree:
416 case recordType.RecalculateStyles: 416 case recordType.RecalculateStyles:
417 details = linkifyTopCallFrame(); 417 details = linkifyTopCallFrame();
418 break; 418 break;
419 case recordType.EvaluateScript: 419 case recordType.EvaluateScript:
420 var url = eventData["url"]; 420 var url = eventData["url"];
421 if (url) 421 if (url)
422 details = linkifyLocation("", url, eventData["lineNumber"], 0); 422 details = linkifyLocation("", url, eventData["lineNumber"], 0);
423 break; 423 break;
424 default: 424 default:
425 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) 425 if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory))
426 detailsText = null; 426 detailsText = null;
427 else 427 else
428 details = linkifyTopCallFrame(); 428 details = linkifyTopCallFrame();
429 break; 429 break;
430 } 430 }
431 431
432 if (!details && detailsText) 432 if (!details && detailsText)
433 details = createTextNode(detailsText); 433 details = createTextNode(detailsText);
434 return details; 434 return details;
435 435
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after
1671 WebInspector.TimelineUIUtils.markerStyleForEvent = function(event) 1671 WebInspector.TimelineUIUtils.markerStyleForEvent = function(event)
1672 { 1672 {
1673 var red = "rgb(255, 0, 0)"; 1673 var red = "rgb(255, 0, 0)";
1674 var blue = "rgb(0, 0, 255)"; 1674 var blue = "rgb(0, 0, 255)";
1675 var orange = "rgb(255, 178, 23)"; 1675 var orange = "rgb(255, 178, 23)";
1676 var green = "rgb(0, 130, 0)"; 1676 var green = "rgb(0, 130, 0)";
1677 var tallMarkerDashStyle = [10, 5]; 1677 var tallMarkerDashStyle = [10, 5];
1678 1678
1679 var title = WebInspector.TimelineUIUtils.eventTitle(event) 1679 var title = WebInspector.TimelineUIUtils.eventTitle(event)
1680 1680
1681 if (event.category === WebInspector.TracingModel.ConsoleEventCategory) { 1681 if (event.hasCategory(WebInspector.TracingModel.ConsoleEventCategory)) {
1682 return { 1682 return {
1683 title: title, 1683 title: title,
1684 dashStyle: tallMarkerDashStyle, 1684 dashStyle: tallMarkerDashStyle,
1685 lineWidth: 0.5, 1685 lineWidth: 0.5,
1686 color: orange, 1686 color: orange,
1687 tall: false, 1687 tall: false,
1688 lowPriority: false, 1688 lowPriority: false,
1689 }; 1689 };
1690 } 1690 }
1691 var recordTypes = WebInspector.TimelineModel.RecordType; 1691 var recordTypes = WebInspector.TimelineModel.RecordType;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1903 return; 1903 return;
1904 1904
1905 var stackTraceElement = parentElement.createChild("div", "timeline-detai ls-view-row-value timeline-details-view-row-stack-trace monospace"); 1905 var stackTraceElement = parentElement.createChild("div", "timeline-detai ls-view-row-value timeline-details-view-row-stack-trace monospace");
1906 1906
1907 var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePre viewContents(this._target, this._linkifier, stackTrace); 1907 var callFrameElem = WebInspector.DOMPresentationUtils.buildStackTracePre viewContents(this._target, this._linkifier, stackTrace);
1908 1908
1909 stackTraceElement.appendChild(callFrameElem); 1909 stackTraceElement.appendChild(callFrameElem);
1910 } 1910 }
1911 1911
1912 } 1912 }
OLDNEW
« no previous file with comments | « Source/devtools/front_end/timeline/TimelineModel.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698