DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime.

third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 221 matching lines @@
  * @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 {!Array.<!ConsoleAgent.CallFrame>=} stackTrace
+ * @param {!RuntimeAgent.StackTrace=} stackTrace
  * @param {number=} timestamp
  * @param {!RuntimeAgent.ExecutionContextId=} executionContextId
- * @param {!ConsoleAgent.AsyncStackTrace=} asyncStackTrace
  * @param {?string=} scriptId
  * @param {number=} messageId
  * @param {number=} relatedMessageId
  */
-WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, asyncStackTrace, scriptId, messageId, relatedMessageId)
+WebInspector.ConsoleMessage = function(target, source, level, messageText, type, url, line, column, requestId, parameters, stackTrace, timestamp, executionContextId, scriptId, messageId, relatedMessageId)
 {
     this._target = target;
     this.source = source;
     this.level = level;
     this.messageText = messageText;
     this.type = type || WebInspector.ConsoleMessage.MessageType.Log;
     /** @type {string|undefined} */
     this.url = url || undefined;
     /** @type {number} */
     this.line = line || 0;
     /** @type {number} */
     this.column = column || 0;
     this.parameters = parameters;
-    /** @type {!Array.<!ConsoleAgent.CallFrame>|undefined} */
+    /** @type {!RuntimeAgent.StackTrace|undefined} */
     this.stackTrace = stackTrace;
     this.timestamp = timestamp || Date.now();
     this.executionContextId = executionContextId || 0;
-    this.asyncStackTrace = asyncStackTrace;
     this.scriptId = scriptId || null;
     this._messageId = messageId || 0;
     this._relatedMessageId = relatedMessageId || 0;
 
     this.request = requestId ? target.networkLog.requestForId(requestId) : null;
 
     if (this.request) {
         var initiator = this.request.initiator();
         if (initiator) {
-            this.stackTrace = initiator.stackTrace || undefined;
-            this.asyncStackTrace = initiator.asyncStackTrace;
+            this.stackTrace = initiator.stack || undefined;
             if (initiator.url) {
                 this.url = initiator.url;
                 this.line = initiator.lineNumber || 0;
             }
         }
     }
 }
 
 WebInspector.ConsoleMessage.prototype = {
     /**
@@ skipping 66 matching lines @@
             return false;
 
         if (this._messageId || msg._messageId)
             return false;
         if (this._relatedMessageId || msg._relatedMessageId)
             return false;
 
         if (!this._isEqualStackTraces(this.stackTrace, msg.stackTrace))
             return false;
 
-        var asyncTrace1 = this.asyncStackTrace;
-        var asyncTrace2 = msg.asyncStackTrace;
-        while (asyncTrace1 || asyncTrace2) {
-            if (!asyncTrace1 || !asyncTrace2)
-                return false;
-            if (asyncTrace1.description !== asyncTrace2.description)
-                return false;
-            if (!this._isEqualStackTraces(asyncTrace1.callFrames, asyncTrace2.callFrames))
-                return false;
-            asyncTrace1 = asyncTrace1.asyncStackTrace;
-            asyncTrace2 = asyncTrace2.asyncStackTrace;
-        }
-
         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;
             }
         }
 
         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 {!Array.<!ConsoleAgent.CallFrame>|undefined} stackTrace1
-     * @param {!Array.<!ConsoleAgent.CallFrame>|undefined} stackTrace2
+     * @param {!RuntimeAgent.StackTrace|undefined} stackTrace1
+     * @param {!RuntimeAgent.StackTrace|undefined} stackTrace2
      * @return {boolean}
      */
     _isEqualStackTraces: function(stackTrace1, stackTrace2)
     {
-        stackTrace1 = stackTrace1 || [];
-        stackTrace2 = stackTrace2 || [];
-        if (stackTrace1.length !== stackTrace2.length)
+        if (!stackTrace1 !== !stackTrace2)
             return false;
-        for (var i = 0, n = stackTrace1.length; i < n; ++i) {
-            if (stackTrace1[i].url !== stackTrace2[i].url ||
-                stackTrace1[i].functionName !== stackTrace2[i].functionName ||
-                stackTrace1[i].lineNumber !== stackTrace2[i].lineNumber ||
-                stackTrace1[i].columnNumber !== stackTrace2[i].columnNumber)
+        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 true;
+        return this._isEqualStackTraces(stackTrace1.parent, stackTrace2.parent);
     }
 }
 
 // Note: Keep these constants in sync with the ones in Console.h
 /**
  * @enum {string}
  */
 WebInspector.ConsoleMessage.MessageSource = {
     XML: "xml",
     JS: "javascript",
@@ skipping 71 matching lines @@
             this._console.target(),
             payload.source,
             payload.level,
             payload.text,
             payload.type,
             payload.url,
             payload.line,
             payload.column,
             payload.networkRequestId,
             payload.parameters,
-            payload.stackTrace,
+            payload.stack,
             payload.timestamp * 1000, // Convert to ms.
             payload.executionContextId,
-            payload.asyncStackTrace,
             payload.scriptId,
             payload.messageId,
             payload.relatedMessageId);
         this._console.addMessage(consoleMessage);
     },
 
     /**
      * @override
      * @param {number} count
      */
@@ skipping 90 matching lines @@
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, event.data);
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 /**
  * @type {!WebInspector.MultitargetConsoleModel}
  */
 WebInspector.multitargetConsoleModel;