third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js - Issue 2752403002: [DevTools] Migrate usages of Target to RuntimeModel where makes sense

Unified Diff: third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js

Issue 2752403002: [DevTools] Migrate usages of Target to RuntimeModel where makes sense (Closed)

Patch Set: compilation errors Created 3 years, 9 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 side-by-side diff with in-line comments

« third_party/WebKit/LayoutTests/inspector/sources/dont-diverge-script-evaluated-twice.html ('K') | « third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js ('k') | third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js » ('j') | third_party/WebKit/Source/devtools/front_end/profiler/ProfileView.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js

diff --git a/third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js b/third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js

index fe95a26edad96c606d82eadd6389a36ca43b4f38..caea9824c305cbb18cbf55ad002d588752280ec5 100644

--- a/third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js

+++ b/third_party/WebKit/Source/devtools/front_end/console_model/ConsoleModel.js

@@ -207,7 +207,7 @@ ConsoleModel.ConsoleModel = class extends Common.Object {

_exceptionThrown(runtimeModel, event) {

var exceptionWithTimestamp = /** @type {!SDK.RuntimeModel.ExceptionWithTimestamp} */ (event.data);

var consoleMessage = ConsoleModel.ConsoleMessage.fromException(

- runtimeModel.target(), exceptionWithTimestamp.details, undefined, exceptionWithTimestamp.timestamp, undefined);

+ runtimeModel, exceptionWithTimestamp.details, undefined, exceptionWithTimestamp.timestamp, undefined);

consoleMessage.setExceptionId(exceptionWithTimestamp.details.exceptionId);

this.addMessage(consoleMessage);

}

@@ -461,18 +461,19 @@ ConsoleModel.ConsoleMessage = class {

}

/**

- * @param {!SDK.Target} target

+ * @param {!SDK.RuntimeModel} runtimeModel

caseq 2017/03/17 18:30:43 Meeh :( Perhaps keep target here?

dgozman 2017/03/17 21:43:46 Since exception comes from a runtime, passing Runt

* @param {!Protocol.Runtime.ExceptionDetails} exceptionDetails

* @param {string=} messageType

* @param {number=} timestamp

* @param {string=} forceUrl

* @return {!ConsoleModel.ConsoleMessage}

- static fromException(target, exceptionDetails, messageType, timestamp, forceUrl) {

+ static fromException(runtimeModel, exceptionDetails, messageType, timestamp, forceUrl) {

return new ConsoleModel.ConsoleMessage(

- target, ConsoleModel.ConsoleMessage.MessageSource.JS, ConsoleModel.ConsoleMessage.MessageLevel.Error,

- SDK.RuntimeModel.simpleTextFromException(exceptionDetails), messageType, forceUrl || exceptionDetails.url,

- exceptionDetails.lineNumber, exceptionDetails.columnNumber, undefined,

+ runtimeModel.target(), ConsoleModel.ConsoleMessage.MessageSource.JS,

+ ConsoleModel.ConsoleMessage.MessageLevel.Error, SDK.RuntimeModel.simpleTextFromException(exceptionDetails),

+ messageType, forceUrl || exceptionDetails.url, exceptionDetails.lineNumber, exceptionDetails.columnNumber,

+ undefined,

exceptionDetails.exception ?

[SDK.RemoteObject.fromLocalObject(exceptionDetails.text), exceptionDetails.exception] :

undefined,