Index: third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js |
index 44f865d7ba0cfdb1e0b04e8e2798e148cecb03fb..7f0b9b590185ffb25afe5061d5fc1cb79340f230 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js |
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js |
@@ -79,6 +79,9 @@ WebInspector.ConsoleModel.prototype = { |
if (this._isBlacklisted(msg)) |
return; |
+ if (msg.source === WebInspector.ConsoleMessage.MessageSource.Worker && msg.target().workerManager && msg.target().workerManager.targetByWorkerId(msg.workerId)) |
+ return; |
+ |
if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._revokedExceptionId) { |
var exceptionMessage = this._messageByExceptionId.get(msg._revokedExceptionId); |
if (!exceptionMessage) |
@@ -244,8 +247,9 @@ WebInspector.ConsoleModel.clearConsole = function() |
* @param {number=} timestamp |
* @param {!RuntimeAgent.ExecutionContextId=} executionContextId |
* @param {?string=} scriptId |
+ * @param {?string=} workerId |
*/ |
-WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId) |
+WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId, workerId) |
{ |
this._target = target; |
this.source = source; |
@@ -264,6 +268,7 @@ WebInspector.ConsoleMessage = function(target, source, level, messageText, type, |
this.timestamp = timestamp || Date.now(); |
this.executionContextId = executionContextId || 0; |
this.scriptId = scriptId || null; |
+ this.workerId = workerId || null; |
var networkLog = target && WebInspector.NetworkLog.fromTarget(target); |
this.request = (requestId && networkLog) ? networkLog.requestForId(requestId) : null; |
@@ -438,7 +443,8 @@ WebInspector.ConsoleMessage.MessageSource = { |
CSS: "css", |
Security: "security", |
Other: "other", |
- Deprecation: "deprecation" |
+ Deprecation: "deprecation", |
+ Worker: "worker" |
} |
/** |
@@ -514,7 +520,8 @@ WebInspector.ConsoleDispatcher.prototype = { |
payload.stack, |
payload.timestamp * 1000, // Convert to ms. |
payload.executionContextId, |
- payload.scriptId); |
+ payload.scriptId, |
+ payload.workerId); |
this._console.addMessage(consoleMessage); |
}, |