Chromium Code Reviews| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 306 { | 306 { |
| 307 return WebInspector.TimelineUIUtils._interactionPhaseStyles().get(phase).lab el; | 307 return WebInspector.TimelineUIUtils._interactionPhaseStyles().get(phase).lab el; |
| 308 } | 308 } |
| 309 | 309 |
| 310 /** | 310 /** |
| 311 * @param {!RuntimeAgent.CallFrame} frame | 311 * @param {!RuntimeAgent.CallFrame} frame |
| 312 * @return {boolean} | 312 * @return {boolean} |
| 313 */ | 313 */ |
| 314 WebInspector.TimelineUIUtils.isUserFrame = function(frame) | 314 WebInspector.TimelineUIUtils.isUserFrame = function(frame) |
| 315 { | 315 { |
| 316 return frame.scriptId !== "0" && frame.url && !frame.url.startsWith("native "); | 316 return frame.scriptId !== "0" && (!frame.url || !frame.url.startsWith("nativ e ")); |
|
alph
2016/06/17 12:08:07
nit: !(frame.url && frame.url.startsWith("native "
| |
| 317 } | 317 } |
| 318 | 318 |
| 319 /** | 319 /** |
| 320 * @param {!WebInspector.TracingModel.Event} event | 320 * @param {!WebInspector.TracingModel.Event} event |
| 321 * @return {?RuntimeAgent.CallFrame} | 321 * @return {?RuntimeAgent.CallFrame} |
| 322 */ | 322 */ |
| 323 WebInspector.TimelineUIUtils.topStackFrame = function(event) | 323 WebInspector.TimelineUIUtils.topStackFrame = function(event) |
| 324 { | 324 { |
| 325 var stackTrace = event.stackTrace || event.initiator && event.initiator.stac kTrace; | 325 var stackTrace = event.stackTrace || event.initiator && event.initiator.stac kTrace; |
| 326 return stackTrace && stackTrace.length ? stackTrace[0] : null; | 326 return stackTrace && stackTrace.length ? stackTrace[0] : null; |
| (...skipping 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2135 case warnings.V8Deopt: | 2135 case warnings.V8Deopt: |
| 2136 span.appendChild(WebInspector.linkifyURLAsNode("https://github.com/Googl eChrome/devtools-docs/issues/53", | 2136 span.appendChild(WebInspector.linkifyURLAsNode("https://github.com/Googl eChrome/devtools-docs/issues/53", |
| 2137 WebInspector.UIString("Not optimized"), undefined, true)); | 2137 WebInspector.UIString("Not optimized"), undefined, true)); |
| 2138 span.createTextChild(WebInspector.UIString(": %s", eventData["deoptReaso n"])); | 2138 span.createTextChild(WebInspector.UIString(": %s", eventData["deoptReaso n"])); |
| 2139 break; | 2139 break; |
| 2140 default: | 2140 default: |
| 2141 console.assert(false, "Unhandled TimelineModel.WarningType"); | 2141 console.assert(false, "Unhandled TimelineModel.WarningType"); |
| 2142 } | 2142 } |
| 2143 return span; | 2143 return span; |
| 2144 } | 2144 } |
| OLD | NEW |