OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
4 * Copyright (C) 2009 Joseph Pecoraro | 4 * Copyright (C) 2009 Joseph Pecoraro |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * | 9 * |
10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 * @param {boolean} useBlackboxing | 312 * @param {boolean} useBlackboxing |
313 * @return {?ConsoleAgent.CallFrame} | 313 * @return {?ConsoleAgent.CallFrame} |
314 */ | 314 */ |
315 _callFrameAnchorFromStackTrace: function(stackTrace, useBlackboxing) | 315 _callFrameAnchorFromStackTrace: function(stackTrace, useBlackboxing) |
316 { | 316 { |
317 if (!stackTrace || !stackTrace.length) | 317 if (!stackTrace || !stackTrace.length) |
318 return null; | 318 return null; |
319 var callFrame = stackTrace[0].scriptId ? stackTrace[0] : null; | 319 var callFrame = stackTrace[0].scriptId ? stackTrace[0] : null; |
320 if (!useBlackboxing) | 320 if (!useBlackboxing) |
321 return callFrame; | 321 return callFrame; |
| 322 var target = this._target(); |
322 for (var i = 0; i < stackTrace.length; ++i) { | 323 for (var i = 0; i < stackTrace.length; ++i) { |
323 if (!WebInspector.BlackboxSupport.isBlackboxedURL(stackTrace[i].url)
) | 324 var script = target && target.debuggerModel.scriptForId(stackTrace[i
].scriptId); |
| 325 var blackboxed = script ? |
| 326 WebInspector.BlackboxSupport.isBlackboxed(script.sourceURL, scri
pt.isContentScript()) : |
| 327 WebInspector.BlackboxSupport.isBlackboxedURL(stackTrace[i].url); |
| 328 if (!blackboxed) |
324 return stackTrace[i].scriptId ? stackTrace[i] : null; | 329 return stackTrace[i].scriptId ? stackTrace[i] : null; |
325 } | 330 } |
326 return callFrame; | 331 return callFrame; |
327 }, | 332 }, |
328 | 333 |
329 /** | 334 /** |
330 * @return {boolean} | 335 * @return {boolean} |
331 */ | 336 */ |
332 isErrorOrWarning: function() | 337 isErrorOrWarning: function() |
333 { | 338 { |
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 { | 1281 { |
1277 if (!this._wrapperElement) { | 1282 if (!this._wrapperElement) { |
1278 WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this
); | 1283 WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this
); |
1279 this._wrapperElement.classList.toggle("collapsed", this._collapsed); | 1284 this._wrapperElement.classList.toggle("collapsed", this._collapsed); |
1280 } | 1285 } |
1281 return this._wrapperElement; | 1286 return this._wrapperElement; |
1282 }, | 1287 }, |
1283 | 1288 |
1284 __proto__: WebInspector.ConsoleViewMessage.prototype | 1289 __proto__: WebInspector.ConsoleViewMessage.prototype |
1285 } | 1290 } |
OLD | NEW |