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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month 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
Download patch
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/Connections.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/ContentProviders.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7ce9015962ae01b888bac056a4a8cffa53855ca5..1ba19faf3ac64af5f767e6ea15b9d792109fa890 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
@@ -27,16 +27,16 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
/**
- * @constructor
- * @extends {WebInspector.SDKModel}
- * @param {!WebInspector.Target} target
- * @param {?Protocol.LogAgent} logAgent
+ * @unrestricted
*/
-WebInspector.ConsoleModel = function(target, logAgent)
-{
- WebInspector.SDKModel.call(this, WebInspector.ConsoleModel, target);
+WebInspector.ConsoleModel = class extends WebInspector.SDKModel {
+ /**
+ * @param {!WebInspector.Target} target
+ * @param {?Protocol.LogAgent} logAgent
+ */
+ constructor(target, logAgent) {
+ super(WebInspector.ConsoleModel, target);
/** @type {!Array.<!WebInspector.ConsoleMessage>} */
this._messages = [];
@@ -47,148 +47,23 @@ WebInspector.ConsoleModel = function(target, logAgent)
this._revokedErrors = 0;
this._logAgent = logAgent;
if (this._logAgent) {
- target.registerLogDispatcher(new WebInspector.LogDispatcher(this));
- this._logAgent.enable();
+ target.registerLogDispatcher(new WebInspector.LogDispatcher(this));
+ this._logAgent.enable();
}
-};
-
-/** @enum {symbol} */
-WebInspector.ConsoleModel.Events = {
- ConsoleCleared: Symbol("ConsoleCleared"),
- MessageAdded: Symbol("MessageAdded"),
- MessageUpdated: Symbol("MessageUpdated"),
- CommandEvaluated: Symbol("CommandEvaluated")
-};
-
-WebInspector.ConsoleModel.prototype = {
- /**
- * @param {!WebInspector.ConsoleMessage} msg
- */
- addMessage: function(msg)
- {
- if (this._isBlacklisted(msg))
- return;
-
- if (msg.source === WebInspector.ConsoleMessage.MessageSource.Worker && msg.target().subTargetsManager && msg.target().subTargetsManager.targetForId(msg.workerId))
- return;
-
- if (msg.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI && msg.type === WebInspector.ConsoleMessage.MessageType.Clear)
- this.clear();
-
- if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._revokedExceptionId) {
- var exceptionMessage = this._messageByExceptionId.get(msg._revokedExceptionId);
- if (!exceptionMessage)
- return;
- this._errors--;
- this._revokedErrors++;
- exceptionMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, exceptionMessage);
- return;
- }
-
- this._messages.push(msg);
- if (msg._exceptionId)
- this._messageByExceptionId.set(msg._exceptionId, msg);
- this._incrementErrorWarningCount(msg);
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
- },
-
- /**
- * @param {!WebInspector.ConsoleMessage} msg
- */
- _incrementErrorWarningCount: function(msg)
- {
- switch (msg.level) {
- case WebInspector.ConsoleMessage.MessageLevel.Warning:
- this._warnings++;
- break;
- case WebInspector.ConsoleMessage.MessageLevel.Error:
- this._errors++;
- break;
- case WebInspector.ConsoleMessage.MessageLevel.RevokedError:
- this._revokedErrors++;
- break;
- }
- },
-
- /**
- * @param {!WebInspector.ConsoleMessage} msg
- * @return {boolean}
- */
- _isBlacklisted: function(msg)
- {
- if (msg.source !== WebInspector.ConsoleMessage.MessageSource.Network || msg.level !== WebInspector.ConsoleMessage.MessageLevel.Error || !msg.url || !msg.url.startsWith("chrome-extension"))
- return false;
-
- // ignore Chromecast's cast_sender spam
- if (msg.url.includes("://boadgeojelhgndaghljhdicfkmllpafd") || msg.url.includes("://dliochdbjfkdbacpmhlcpmleaejidimm") || msg.url.includes("://pkedcjkdefgpdelpbcmbmeomcjbeemfm") || msg.url.includes("://fjhoaacokmgbjemoflkofnenfaiekifl") || msg.url.includes("://fmfcbgogabcbclcofgocippekhfcmgfj") || msg.url.includes("://enhhojjnijigcajfphajepfemndkmdlo") || msg.url.includes("://ekpaaapppgpmolpcldedioblbkmijaca"))
- return true;
-
- return false;
- },
-
- /**
- * @return {!Array.<!WebInspector.ConsoleMessage>}
- */
- messages: function()
- {
- return this._messages;
- },
-
- requestClearMessages: function()
- {
- this._logAgent && this._logAgent.clear();
- this.clear();
- },
-
- clear: function()
- {
- this._messages = [];
- this._messageByExceptionId.clear();
- this._errors = 0;
- this._revokedErrors = 0;
- this._warnings = 0;
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
- },
-
- /**
- * @return {number}
- */
- errors: function()
- {
- return this._errors;
- },
-
- /**
- * @return {number}
- */
- revokedErrors: function()
- {
- return this._revokedErrors;
- },
-
- /**
- * @return {number}
- */
- warnings: function()
- {
- return this._warnings;
- },
-
- __proto__: WebInspector.SDKModel.prototype
-};
-
-/**
- * @param {!WebInspector.ExecutionContext} executionContext
- * @param {string} text
- * @param {boolean=} useCommandLineAPI
- */
-WebInspector.ConsoleModel.evaluateCommandInConsole = function(executionContext, text, useCommandLineAPI)
-{
+ }
+
+ /**
+ * @param {!WebInspector.ExecutionContext} executionContext
+ * @param {string} text
+ * @param {boolean=} useCommandLineAPI
+ */
+ static evaluateCommandInConsole(executionContext, text, useCommandLineAPI) {
var target = executionContext.target();
var requestedText = text;
- var commandMessage = new WebInspector.ConsoleMessage(target, WebInspector.ConsoleMessage.MessageSource.JS, null, text, WebInspector.ConsoleMessage.MessageType.Command);
+ var commandMessage = new WebInspector.ConsoleMessage(
+ target, WebInspector.ConsoleMessage.MessageSource.JS, null, text,
+ WebInspector.ConsoleMessage.MessageType.Command);
commandMessage.setExecutionContextId(executionContext.id);
target.consoleModel.addMessage(commandMessage);
@@ -196,16 +71,16 @@ WebInspector.ConsoleModel.evaluateCommandInConsole = function(executionContext,
* @param {?WebInspector.RemoteObject} result
* @param {!RuntimeAgent.ExceptionDetails=} exceptionDetails
*/
- function printResult(result, exceptionDetails)
- {
- if (!result)
- return;
-
- WebInspector.console.showPromise().then(reportUponEvaluation);
- function reportUponEvaluation()
- {
- target.consoleModel.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, {result: result, text: requestedText, commandMessage: commandMessage, exceptionDetails: exceptionDetails});
- }
+ function printResult(result, exceptionDetails) {
+ if (!result)
+ return;
+
+ WebInspector.console.showPromise().then(reportUponEvaluation);
+ function reportUponEvaluation() {
+ target.consoleModel.dispatchEventToListeners(
+ WebInspector.ConsoleModel.Events.CommandEvaluated,
+ {result: result, text: requestedText, commandMessage: commandMessage, exceptionDetails: exceptionDetails});
+ }
}
/**
@@ -213,52 +88,193 @@ WebInspector.ConsoleModel.evaluateCommandInConsole = function(executionContext,
* @suppress {uselessCode}
* @return {boolean}
*/
- function looksLikeAnObjectLiteral(code)
- {
- // Only parenthesize what appears to be an object literal.
- if (!(/^\s*\{/.test(code) && /\}\s*$/.test(code)))
- return false;
-
- try {
- // Check if the code can be interpreted as an expression.
- Function("return " + code + ";");
-
- // No syntax error! Does it work parenthesized?
- Function("(" + code + ")");
-
- return true;
- } catch (e) {
- return false;
- }
+ function looksLikeAnObjectLiteral(code) {
+ // Only parenthesize what appears to be an object literal.
+ if (!(/^\s*\{/.test(code) && /\}\s*$/.test(code)))
+ return false;
+
+ try {
+ // Check if the code can be interpreted as an expression.
+ Function('return ' + code + ';');
+
+ // No syntax error! Does it work parenthesized?
+ Function('(' + code + ')');
+
+ return true;
+ } catch (e) {
+ return false;
+ }
}
if (looksLikeAnObjectLiteral(text))
- text = "(" + text + ")";
+ text = '(' + text + ')';
- executionContext.evaluate(text, "console", !!useCommandLineAPI, false, false, true, true, printResult);
+ executionContext.evaluate(text, 'console', !!useCommandLineAPI, false, false, true, true, printResult);
WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.ConsoleEvaluated);
+ }
+
+ /**
+ * @param {!WebInspector.ConsoleMessage} msg
+ */
+ addMessage(msg) {
+ if (this._isBlacklisted(msg))
+ return;
+
+ if (msg.source === WebInspector.ConsoleMessage.MessageSource.Worker && msg.target().subTargetsManager &&
+ msg.target().subTargetsManager.targetForId(msg.workerId))
+ return;
+
+ if (msg.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI &&
+ msg.type === WebInspector.ConsoleMessage.MessageType.Clear)
+ this.clear();
+
+ if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._revokedExceptionId) {
+ var exceptionMessage = this._messageByExceptionId.get(msg._revokedExceptionId);
+ if (!exceptionMessage)
+ return;
+ this._errors--;
+ this._revokedErrors++;
+ exceptionMessage.level = WebInspector.ConsoleMessage.MessageLevel.RevokedError;
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, exceptionMessage);
+ return;
+ }
+
+ this._messages.push(msg);
+ if (msg._exceptionId)
+ this._messageByExceptionId.set(msg._exceptionId, msg);
+ this._incrementErrorWarningCount(msg);
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
+ }
+
+ /**
+ * @param {!WebInspector.ConsoleMessage} msg
+ */
+ _incrementErrorWarningCount(msg) {
+ switch (msg.level) {
+ case WebInspector.ConsoleMessage.MessageLevel.Warning:
+ this._warnings++;
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.Error:
+ this._errors++;
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.RevokedError:
+ this._revokedErrors++;
+ break;
+ }
+ }
+
+ /**
+ * @param {!WebInspector.ConsoleMessage} msg
+ * @return {boolean}
+ */
+ _isBlacklisted(msg) {
+ if (msg.source !== WebInspector.ConsoleMessage.MessageSource.Network ||
+ msg.level !== WebInspector.ConsoleMessage.MessageLevel.Error || !msg.url ||
+ !msg.url.startsWith('chrome-extension'))
+ return false;
+
+ // ignore Chromecast's cast_sender spam
+ if (msg.url.includes('://boadgeojelhgndaghljhdicfkmllpafd') ||
+ msg.url.includes('://dliochdbjfkdbacpmhlcpmleaejidimm') ||
+ msg.url.includes('://pkedcjkdefgpdelpbcmbmeomcjbeemfm') ||
+ msg.url.includes('://fjhoaacokmgbjemoflkofnenfaiekifl') ||
+ msg.url.includes('://fmfcbgogabcbclcofgocippekhfcmgfj') ||
+ msg.url.includes('://enhhojjnijigcajfphajepfemndkmdlo') ||
+ msg.url.includes('://ekpaaapppgpmolpcldedioblbkmijaca'))
+ return true;
+
+ return false;
+ }
+
+ /**
+ * @return {!Array.<!WebInspector.ConsoleMessage>}
+ */
+ messages() {
+ return this._messages;
+ }
+
+ requestClearMessages() {
+ this._logAgent && this._logAgent.clear();
+ this.clear();
+ }
+
+ clear() {
+ this._messages = [];
+ this._messageByExceptionId.clear();
+ this._errors = 0;
+ this._revokedErrors = 0;
+ this._warnings = 0;
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
+ }
+
+ /**
+ * @return {number}
+ */
+ errors() {
+ return this._errors;
+ }
+
+ /**
+ * @return {number}
+ */
+ revokedErrors() {
+ return this._revokedErrors;
+ }
+
+ /**
+ * @return {number}
+ */
+ warnings() {
+ return this._warnings;
+ }
+};
+
+/** @enum {symbol} */
+WebInspector.ConsoleModel.Events = {
+ ConsoleCleared: Symbol('ConsoleCleared'),
+ MessageAdded: Symbol('MessageAdded'),
+ MessageUpdated: Symbol('MessageUpdated'),
+ CommandEvaluated: Symbol('CommandEvaluated')
};
+
/**
- * @constructor
- * @param {?WebInspector.Target} target
- * @param {string} source
- * @param {?string} level
- * @param {string} messageText
- * @param {string=} type
- * @param {?string=} url
- * @param {number=} line
- * @param {number=} column
- * @param {!NetworkAgent.RequestId=} requestId
- * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
- * @param {!RuntimeAgent.StackTrace=} stackTrace
- * @param {number=} timestamp
- * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
- * @param {?string=} scriptId
- * @param {?string=} workerId
+ * @unrestricted
*/
-WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId, workerId)
-{
+WebInspector.ConsoleMessage = class {
+ /**
+ * @param {?WebInspector.Target} target
+ * @param {string} source
+ * @param {?string} level
+ * @param {string} messageText
+ * @param {string=} type
+ * @param {?string=} url
+ * @param {number=} line
+ * @param {number=} column
+ * @param {!NetworkAgent.RequestId=} requestId
+ * @param {!Array.<!RuntimeAgent.RemoteObject>=} parameters
+ * @param {!RuntimeAgent.StackTrace=} stackTrace
+ * @param {number=} timestamp
+ * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
+ * @param {?string=} scriptId
+ * @param {?string=} workerId
+ */
+ constructor(
+ target,
+ source,
+ level,
+ messageText,
+ type,
+ url,
+ line,
+ column,
+ requestId,
+ parameters,
+ stackTrace,
+ timestamp,
+ executionContextId,
+ scriptId,
+ workerId) {
this._target = target;
this.source = source;
this.level = level;
@@ -282,158 +298,185 @@ WebInspector.ConsoleMessage = function(target, source, level, messageText, type,
this.request = (requestId && networkLog) ? networkLog.requestForId(requestId) : null;
if (this.request) {
- var initiator = this.request.initiator();
- if (initiator) {
- this.stackTrace = initiator.stack || undefined;
- if (initiator.url) {
- this.url = initiator.url;
- this.line = initiator.lineNumber || 0;
- }
+ var initiator = this.request.initiator();
+ if (initiator) {
+ this.stackTrace = initiator.stack || undefined;
+ if (initiator.url) {
+ this.url = initiator.url;
+ this.line = initiator.lineNumber || 0;
}
+ }
}
-};
-
-WebInspector.ConsoleMessage.prototype = {
- /**
- * @return {?WebInspector.Target}
- */
- target: function()
- {
- return this._target;
- },
-
- /**
- * @param {!WebInspector.ConsoleMessage} originatingMessage
- */
- setOriginatingMessage: function(originatingMessage)
- {
- this._originatingConsoleMessage = originatingMessage;
- this.executionContextId = originatingMessage.executionContextId;
- },
-
- /**
- * @param {!RuntimeAgent.ExecutionContextId} executionContextId
- */
- setExecutionContextId: function(executionContextId)
- {
- this.executionContextId = executionContextId;
- },
-
- /**
- * @param {number} exceptionId
- */
- setExceptionId: function(exceptionId)
- {
- this._exceptionId = exceptionId;
- },
-
- /**
- * @param {number} revokedExceptionId
- */
- setRevokedExceptionId: function(revokedExceptionId)
- {
- this._revokedExceptionId = revokedExceptionId;
- },
-
- /**
- * @return {?WebInspector.ConsoleMessage}
- */
- originatingMessage: function()
- {
- return this._originatingConsoleMessage;
- },
-
- /**
- * @return {boolean}
- */
- isGroupMessage: function()
- {
- return this.type === WebInspector.ConsoleMessage.MessageType.StartGroup ||
- this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed ||
- this.type === WebInspector.ConsoleMessage.MessageType.EndGroup;
- },
-
- /**
- * @return {boolean}
- */
- isGroupStartMessage: function()
- {
- return this.type === WebInspector.ConsoleMessage.MessageType.StartGroup ||
- this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed;
- },
-
- /**
- * @return {boolean}
- */
- isErrorOrWarning: function()
- {
- return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
- },
+ }
+
+ /**
+ * @param {!WebInspector.ConsoleMessage} a
+ * @param {!WebInspector.ConsoleMessage} b
+ * @return {number}
+ */
+ static timestampComparator(a, b) {
+ return a.timestamp - b.timestamp;
+ }
- /**
- * @param {?WebInspector.ConsoleMessage} msg
- * @return {boolean}
- */
- isEqual: function(msg)
- {
- if (!msg)
- return false;
-
- if (this._exceptionId || msg._exceptionId)
- return false;
- if (this._revokedExceptionId || msg._revokedExceptionId)
- return false;
-
- if (!this._isEqualStackTraces(this.stackTrace, msg.stackTrace))
- return false;
-
- if (this.parameters) {
- if (!msg.parameters || this.parameters.length !== msg.parameters.length)
- return false;
-
- for (var i = 0; i < msg.parameters.length; ++i) {
- // Never treat objects as equal - their properties might change over time.
- if (this.parameters[i].type !== msg.parameters[i].type || msg.parameters[i].type === "object" || this.parameters[i].value !== msg.parameters[i].value)
- return false;
- }
- }
+ /**
+ * @param {!RuntimeAgent.ExceptionDetails} exceptionDetails
+ * @return {string}
+ */
+ static simpleTextFromException(exceptionDetails) {
+ var text = exceptionDetails.text;
+ if (exceptionDetails.exception && exceptionDetails.exception.description) {
+ var description = exceptionDetails.exception.description;
+ if (description.indexOf('\n') !== -1)
+ description = description.substring(0, description.indexOf('\n'));
+ text += ' ' + description;
+ }
+ return text;
+ }
+
+ /**
+ * @param {!WebInspector.Target} target
+ * @param {!RuntimeAgent.ExceptionDetails} exceptionDetails
+ * @param {string=} messageType
+ * @param {number=} timestamp
+ * @param {string=} forceUrl
+ * @return {!WebInspector.ConsoleMessage}
+ */
+ static fromException(target, exceptionDetails, messageType, timestamp, forceUrl) {
+ return new WebInspector.ConsoleMessage(
+ target, WebInspector.ConsoleMessage.MessageSource.JS, WebInspector.ConsoleMessage.MessageLevel.Error,
+ WebInspector.ConsoleMessage.simpleTextFromException(exceptionDetails), messageType,
+ forceUrl || exceptionDetails.url, exceptionDetails.lineNumber, exceptionDetails.columnNumber, undefined,
+ exceptionDetails.exception ?
+ [WebInspector.RemoteObject.fromLocalObject(exceptionDetails.text), exceptionDetails.exception] :
+ undefined,
+ exceptionDetails.stackTrace, timestamp, exceptionDetails.executionContextId, exceptionDetails.scriptId);
+ }
+
+ /**
+ * @return {?WebInspector.Target}
+ */
+ target() {
+ return this._target;
+ }
+
+ /**
+ * @param {!WebInspector.ConsoleMessage} originatingMessage
+ */
+ setOriginatingMessage(originatingMessage) {
+ this._originatingConsoleMessage = originatingMessage;
+ this.executionContextId = originatingMessage.executionContextId;
+ }
+
+ /**
+ * @param {!RuntimeAgent.ExecutionContextId} executionContextId
+ */
+ setExecutionContextId(executionContextId) {
+ this.executionContextId = executionContextId;
+ }
+
+ /**
+ * @param {number} exceptionId
+ */
+ setExceptionId(exceptionId) {
+ this._exceptionId = exceptionId;
+ }
+
+ /**
+ * @param {number} revokedExceptionId
+ */
+ setRevokedExceptionId(revokedExceptionId) {
+ this._revokedExceptionId = revokedExceptionId;
+ }
+
+ /**
+ * @return {?WebInspector.ConsoleMessage}
+ */
+ originatingMessage() {
+ return this._originatingConsoleMessage;
+ }
+
+ /**
+ * @return {boolean}
+ */
+ isGroupMessage() {
+ return this.type === WebInspector.ConsoleMessage.MessageType.StartGroup ||
+ this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed ||
+ this.type === WebInspector.ConsoleMessage.MessageType.EndGroup;
+ }
+
+ /**
+ * @return {boolean}
+ */
+ isGroupStartMessage() {
+ return this.type === WebInspector.ConsoleMessage.MessageType.StartGroup ||
+ this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed;
+ }
+
+ /**
+ * @return {boolean}
+ */
+ isErrorOrWarning() {
+ return (
+ this.level === WebInspector.ConsoleMessage.MessageLevel.Warning ||
+ this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
+ }
+
+ /**
+ * @param {?WebInspector.ConsoleMessage} msg
+ * @return {boolean}
+ */
+ isEqual(msg) {
+ if (!msg)
+ return false;
+
+ if (this._exceptionId || msg._exceptionId)
+ return false;
+ if (this._revokedExceptionId || msg._revokedExceptionId)
+ return false;
+
+ if (!this._isEqualStackTraces(this.stackTrace, msg.stackTrace))
+ return false;
+
+ if (this.parameters) {
+ if (!msg.parameters || this.parameters.length !== msg.parameters.length)
+ return false;
- return (this.target() === msg.target())
- && (this.source === msg.source)
- && (this.type === msg.type)
- && (this.level === msg.level)
- && (this.line === msg.line)
- && (this.url === msg.url)
- && (this.messageText === msg.messageText)
- && (this.request === msg.request)
- && (this.executionContextId === msg.executionContextId)
- && (this.scriptId === msg.scriptId);
- },
+ for (var i = 0; i < msg.parameters.length; ++i) {
+ // Never treat objects as equal - their properties might change over time.
+ if (this.parameters[i].type !== msg.parameters[i].type || msg.parameters[i].type === 'object' ||
+ this.parameters[i].value !== msg.parameters[i].value)
+ return false;
+ }
+ }
- /**
- * @param {!RuntimeAgent.StackTrace|undefined} stackTrace1
- * @param {!RuntimeAgent.StackTrace|undefined} stackTrace2
- * @return {boolean}
- */
- _isEqualStackTraces: function(stackTrace1, stackTrace2)
- {
- if (!stackTrace1 !== !stackTrace2)
- return false;
- if (!stackTrace1)
- return true;
- var callFrames1 = stackTrace1.callFrames;
- var callFrames2 = stackTrace2.callFrames;
- if (callFrames1.length !== callFrames2.length)
- return false;
- for (var i = 0, n = callFrames1.length; i < n; ++i) {
- if (callFrames1[i].url !== callFrames2[i].url ||
- callFrames1[i].functionName !== callFrames2[i].functionName ||
- callFrames1[i].lineNumber !== callFrames2[i].lineNumber ||
- callFrames1[i].columnNumber !== callFrames2[i].columnNumber)
- return false;
- }
- return this._isEqualStackTraces(stackTrace1.parent, stackTrace2.parent);
+ return (this.target() === msg.target()) && (this.source === msg.source) && (this.type === msg.type) &&
+ (this.level === msg.level) && (this.line === msg.line) && (this.url === msg.url) &&
+ (this.messageText === msg.messageText) && (this.request === msg.request) &&
+ (this.executionContextId === msg.executionContextId) && (this.scriptId === msg.scriptId);
+ }
+
+ /**
+ * @param {!RuntimeAgent.StackTrace|undefined} stackTrace1
+ * @param {!RuntimeAgent.StackTrace|undefined} stackTrace2
+ * @return {boolean}
+ */
+ _isEqualStackTraces(stackTrace1, stackTrace2) {
+ if (!stackTrace1 !== !stackTrace2)
+ return false;
+ if (!stackTrace1)
+ return true;
+ var callFrames1 = stackTrace1.callFrames;
+ var callFrames2 = stackTrace2.callFrames;
+ if (callFrames1.length !== callFrames2.length)
+ return false;
+ for (var i = 0, n = callFrames1.length; i < n; ++i) {
+ if (callFrames1[i].url !== callFrames2[i].url || callFrames1[i].functionName !== callFrames2[i].functionName ||
+ callFrames1[i].lineNumber !== callFrames2[i].lineNumber ||
+ callFrames1[i].columnNumber !== callFrames2[i].columnNumber)
+ return false;
}
+ return this._isEqualStackTraces(stackTrace1.parent, stackTrace2.parent);
+ }
};
// Note: Keep these constants in sync with the ones in Console.h
@@ -441,226 +484,156 @@ WebInspector.ConsoleMessage.prototype = {
* @enum {string}
*/
WebInspector.ConsoleMessage.MessageSource = {
- XML: "xml",
- JS: "javascript",
- Network: "network",
- ConsoleAPI: "console-api",
- Storage: "storage",
- AppCache: "appcache",
- Rendering: "rendering",
- CSS: "css",
- Security: "security",
- Other: "other",
- Deprecation: "deprecation",
- Worker: "worker"
+ XML: 'xml',
+ JS: 'javascript',
+ Network: 'network',
+ ConsoleAPI: 'console-api',
+ Storage: 'storage',
+ AppCache: 'appcache',
+ Rendering: 'rendering',
+ CSS: 'css',
+ Security: 'security',
+ Other: 'other',
+ Deprecation: 'deprecation',
+ Worker: 'worker'
};
/**
* @enum {string}
*/
WebInspector.ConsoleMessage.MessageType = {
- Log: "log",
- Debug: "debug",
- Info: "info",
- Error: "error",
- Warning: "warning",
- Dir: "dir",
- DirXML: "dirxml",
- Table: "table",
- Trace: "trace",
- Clear: "clear",
- StartGroup: "startGroup",
- StartGroupCollapsed: "startGroupCollapsed",
- EndGroup: "endGroup",
- Assert: "assert",
- Result: "result",
- Profile: "profile",
- ProfileEnd: "profileEnd",
- Command: "command"
+ Log: 'log',
+ Debug: 'debug',
+ Info: 'info',
+ Error: 'error',
+ Warning: 'warning',
+ Dir: 'dir',
+ DirXML: 'dirxml',
+ Table: 'table',
+ Trace: 'trace',
+ Clear: 'clear',
+ StartGroup: 'startGroup',
+ StartGroupCollapsed: 'startGroupCollapsed',
+ EndGroup: 'endGroup',
+ Assert: 'assert',
+ Result: 'result',
+ Profile: 'profile',
+ ProfileEnd: 'profileEnd',
+ Command: 'command'
};
/**
* @enum {string}
*/
WebInspector.ConsoleMessage.MessageLevel = {
- Log: "log",
- Info: "info",
- Warning: "warning",
- Error: "error",
- Debug: "debug",
- RevokedError: "revokedError" // This is frontend-only level, used to put exceptions to console.
-};
-
-/**
- * @param {!WebInspector.ConsoleMessage} a
- * @param {!WebInspector.ConsoleMessage} b
- * @return {number}
- */
-WebInspector.ConsoleMessage.timestampComparator = function(a, b)
-{
- return a.timestamp - b.timestamp;
+ Log: 'log',
+ Info: 'info',
+ Warning: 'warning',
+ Error: 'error',
+ Debug: 'debug',
+ RevokedError: 'revokedError' // This is frontend-only level, used to put exceptions to console.
};
-/**
- * @param {!RuntimeAgent.ExceptionDetails} exceptionDetails
- * @return {string}
- */
-WebInspector.ConsoleMessage.simpleTextFromException = function(exceptionDetails)
-{
- var text = exceptionDetails.text;
- if (exceptionDetails.exception && exceptionDetails.exception.description) {
- var description = exceptionDetails.exception.description;
- if (description.indexOf("\n") !== -1)
- description = description.substring(0, description.indexOf("\n"));
- text += " " + description;
- }
- return text;
-};
/**
- * @param {!WebInspector.Target} target
- * @param {!RuntimeAgent.ExceptionDetails} exceptionDetails
- * @param {string=} messageType
- * @param {number=} timestamp
- * @param {string=} forceUrl
- * @return {!WebInspector.ConsoleMessage}
- */
-WebInspector.ConsoleMessage.fromException = function(target, exceptionDetails, messageType, timestamp, forceUrl)
-{
- return new WebInspector.ConsoleMessage(
- target,
- WebInspector.ConsoleMessage.MessageSource.JS,
- WebInspector.ConsoleMessage.MessageLevel.Error,
- WebInspector.ConsoleMessage.simpleTextFromException(exceptionDetails),
- messageType,
- forceUrl || exceptionDetails.url,
- exceptionDetails.lineNumber,
- exceptionDetails.columnNumber,
- undefined,
- exceptionDetails.exception ? [WebInspector.RemoteObject.fromLocalObject(exceptionDetails.text), exceptionDetails.exception] : undefined,
- exceptionDetails.stackTrace,
- timestamp,
- exceptionDetails.executionContextId,
- exceptionDetails.scriptId);
-};
-
-/**
- * @constructor
* @implements {LogAgent.Dispatcher}
- * @param {!WebInspector.ConsoleModel} console
+ * @unrestricted
*/
-WebInspector.LogDispatcher = function(console)
-{
+WebInspector.LogDispatcher = class {
+ /**
+ * @param {!WebInspector.ConsoleModel} console
+ */
+ constructor(console) {
this._console = console;
-};
-
-WebInspector.LogDispatcher.prototype = {
- /**
- * @override
- * @param {!LogAgent.LogEntry} payload
- */
- entryAdded: function(payload)
- {
- var consoleMessage = new WebInspector.ConsoleMessage(
- this._console.target(),
- payload.source,
- payload.level,
- payload.text,
- undefined,
- payload.url,
- payload.lineNumber,
- undefined,
- payload.networkRequestId,
- undefined,
- payload.stackTrace,
- payload.timestamp,
- undefined,
- undefined,
- payload.workerId);
- this._console.addMessage(consoleMessage);
- }
+ }
+
+ /**
+ * @override
+ * @param {!LogAgent.LogEntry} payload
+ */
+ entryAdded(payload) {
+ var consoleMessage = new WebInspector.ConsoleMessage(
+ this._console.target(), payload.source, payload.level, payload.text, undefined, payload.url, payload.lineNumber,
+ undefined, payload.networkRequestId, undefined, payload.stackTrace, payload.timestamp, undefined, undefined,
+ payload.workerId);
+ this._console.addMessage(consoleMessage);
+ }
};
/**
- * @constructor
- * @extends {WebInspector.Object}
* @implements {WebInspector.TargetManager.Observer}
+ * @unrestricted
*/
-WebInspector.MultitargetConsoleModel = function()
-{
+WebInspector.MultitargetConsoleModel = class extends WebInspector.Object {
+ constructor() {
+ super();
WebInspector.targetManager.observeTargets(this);
- WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._consoleMessageAdded, this);
- WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageUpdated, this._consoleMessageUpdated, this);
- WebInspector.targetManager.addModelListener(WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
-};
-
-WebInspector.MultitargetConsoleModel.prototype = {
- /**
- * @override
- * @param {!WebInspector.Target} target
- */
- targetAdded: function(target)
- {
- if (!this._mainTarget) {
- this._mainTarget = target;
- target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
- }
- },
-
- /**
- * @override
- * @param {!WebInspector.Target} target
- */
- targetRemoved: function(target)
- {
- if (this._mainTarget === target) {
- delete this._mainTarget;
- target.consoleModel.removeEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
- }
- },
-
- /**
- * @return {!Array.<!WebInspector.ConsoleMessage>}
- */
- messages: function()
- {
- var targets = WebInspector.targetManager.targets();
- var result = [];
- for (var i = 0; i < targets.length; ++i)
- result = result.concat(targets[i].consoleModel.messages());
- return result;
- },
-
- _consoleCleared: function()
- {
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _consoleMessageAdded: function(event)
- {
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, event.data);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _consoleMessageUpdated: function(event)
- {
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, event.data);
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _commandEvaluated: function(event)
- {
- this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, event.data);
- },
-
- __proto__: WebInspector.Object.prototype
+ WebInspector.targetManager.addModelListener(
+ WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageAdded, this._consoleMessageAdded, this);
+ WebInspector.targetManager.addModelListener(
+ WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.MessageUpdated, this._consoleMessageUpdated, this);
+ WebInspector.targetManager.addModelListener(
+ WebInspector.ConsoleModel, WebInspector.ConsoleModel.Events.CommandEvaluated, this._commandEvaluated, this);
+ }
+
+ /**
+ * @override
+ * @param {!WebInspector.Target} target
+ */
+ targetAdded(target) {
+ if (!this._mainTarget) {
+ this._mainTarget = target;
+ target.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
+ }
+ }
+
+ /**
+ * @override
+ * @param {!WebInspector.Target} target
+ */
+ targetRemoved(target) {
+ if (this._mainTarget === target) {
+ delete this._mainTarget;
+ target.consoleModel.removeEventListener(
+ WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
+ }
+ }
+
+ /**
+ * @return {!Array.<!WebInspector.ConsoleMessage>}
+ */
+ messages() {
+ var targets = WebInspector.targetManager.targets();
+ var result = [];
+ for (var i = 0; i < targets.length; ++i)
+ result = result.concat(targets[i].consoleModel.messages());
+ return result;
+ }
+
+ _consoleCleared() {
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _consoleMessageAdded(event) {
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, event.data);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _consoleMessageUpdated(event) {
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageUpdated, event.data);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _commandEvaluated(event) {
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, event.data);
+ }
};
/**
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/Connections.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/ContentProviders.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698