Changeset 37012 in webkit

Timestamp:

Sep 27, 2008 3:18:35 PM (16 years ago)

Author:

timothy@apple.com

Message:

Added support for console.trace.

JavaScriptCore:

2008-09-27 Keishi Hattori <​casey.hattori@gmail.com>

Added Machine::retrieveCaller to the export list.

Reviewed by Kevin McCullough and Tim Hatcher.

• JavaScriptCore.exp: Added Machine::retrieveCaller.

WebCore:

2008-09-27 Keishi Hattori <​casey.hattori@gmail.com>

Added support for console.trace.

​https://bugs.webkit.org/show_bug.cgi?id=19157

Reviewed by Kevin McCullough and Tim Hatcher.

• bindings/js/JSConsoleCustom.cpp: (WebCore::JSConsole::trace):
• page/Console.cpp: (WebCore::Console::trace): Calls Machine::retrieveCaller to get a stack trace.
• page/Console.h: (WebCore::): Added TraceMessageLevel.
• page/Console.idl: Added console.trace.
• page/inspector/Console.js: (ConsoleMessage): Added case for TraceMessageLevel.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSConsoleCustom.cpp (modified) (1 diff)
• WebCore/page/Console.cpp (modified) (1 diff)
• WebCore/page/Console.h (modified) (2 diffs)
• WebCore/page/Console.idl (modified) (1 diff)
• WebCore/page/inspector/Console.js (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-27  Keishi Hattori  <casey.hattori@gmail.com>
+
+        Added Machine::retrieveCaller to the export list.
+
+        Reviewed by Kevin McCullough and Tim Hatcher.
+
+        * JavaScriptCore.exp: Added Machine::retrieveCaller.
+
 2008-09-27  Anders Carlsson  <andersca@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -316 +316 @@
 __ZNK3JSC7JSValue7toFloatEPNS_9ExecStateE
 __ZNK3JSC7JSValue9toIntegerEPNS_9ExecStateE
+__ZNK3JSC7Machine14retrieveCallerEPNS_9ExecStateEPNS_16InternalFunctionE
 __ZNK3JSC7Machine18retrieveLastCallerEPNS_9ExecStateERiS3_RNS_7UStringERPNS_7JSValueE
 __ZNK3JSC7UString10UTF8StringEb

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-27  Keishi Hattori  <casey.hattori@gmail.com>
+
+        Added support for console.trace.
+
+        https://bugs.webkit.org/show_bug.cgi?id=19157
+
+        Reviewed by Kevin McCullough and Tim Hatcher.
+
+        * bindings/js/JSConsoleCustom.cpp:
+        (WebCore::JSConsole::trace):
+        * page/Console.cpp:
+        (WebCore::Console::trace): Calls Machine::retrieveCaller to
+        get a stack trace.
+        * page/Console.h:
+        (WebCore::): Added TraceMessageLevel.
+        * page/Console.idl: Added console.trace.
+        * page/inspector/Console.js:
+        (ConsoleMessage): Added case for TraceMessageLevel.
+
 2008-09-27  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/bindings/js/JSConsoleCustom.cpp

@@ -75 +75 @@
 }
 
+JSValue* JSConsole::trace(ExecState* exec, const ArgList&)
+{
+    impl()->trace(exec);
+    return jsUndefined();
+}
+
 JSValue* JSConsole::assertCondition(ExecState* exec, const ArgList& arguments)
 {

trunk/WebCore/page/Console.cpp

@@ -277 +277 @@
 }
 
+void Console::trace(ExecState* exec)
+{
+    Page* page = this->page();
+    if (!page)
+        return;
+
+    int signedLineNumber;
+    int sourceIdentifer;
+    UString urlString;
+    JSValue* func;
+
+    exec->machine()->retrieveLastCaller(exec, signedLineNumber, sourceIdentifer, urlString, func);
+
+    ArgList args;
+    while (!func->isNull()) {
+        args.append(func);
+        func = exec->machine()->retrieveCaller(exec, static_cast<InternalFunction*>(func));
+    }
+    
+    page->inspectorController()->addMessageToConsole(JSMessageSource, TraceMessageLevel, exec, args, 0, String());
+}
+
 void Console::assertCondition(bool condition, ExecState* exec, const ArgList& args)
 {

trunk/WebCore/page/Console.h

@@ -62 +62 @@
         ObjectMessageLevel,
         NodeMessageLevel,
+        TraceMessageLevel,
         StartGroupMessageLevel,
         EndGroupMessageLevel
@@ -82 +83 @@
         void dir(JSC::ExecState*, const JSC::ArgList&);
         void dirxml(JSC::ExecState*, const JSC::ArgList& arguments);
+        void trace(JSC::ExecState*);
         void assertCondition(bool condition, JSC::ExecState*, const JSC::ArgList&);
         void count(JSC::ExecState*, const JSC::ArgList&);

trunk/WebCore/page/Console.idl

@@ -37 +37 @@
         [Custom] void dir();
         [Custom] void dirxml();
+        [Custom] void trace();
         [Custom, ImplementationFunction=assertCondition] void assert(in boolean condition);
         [Custom] void count();

trunk/WebCore/page/inspector/Console.js

@@ -576 +576 @@
     this.repeatCount = repeatCount;
 
-    if (this.level === WebInspector.ConsoleMessage.MessageLevel.Object) {
-        var propertiesSection = new WebInspector.ObjectPropertiesSection(arguments[6], null, null, null, true);
-        propertiesSection.element.addStyleClass("console-message");
-        this.propertiesSection = propertiesSection;
-    } else if (this.level === WebInspector.ConsoleMessage.MessageLevel.Node) {
-        var node = arguments[6];
-        if (!(node instanceof InspectorController.inspectedWindow().Node))
-            return;
-        this.elementsTreeOutline = new WebInspector.ElementsTreeOutline();
-        this.elementsTreeOutline.rootDOMNode = node;
+    switch (this.level) {
+        case WebInspector.ConsoleMessage.MessageLevel.Object:
+            var propertiesSection = new WebInspector.ObjectPropertiesSection(arguments[6], null, null, null, true);
+            propertiesSection.element.addStyleClass("console-message");
+            this.propertiesSection = propertiesSection;
+            break;
+        case WebInspector.ConsoleMessage.MessageLevel.Node:
+            var node = arguments[6];
+            if (!(node instanceof InspectorController.inspectedWindow().Node))
+                return;
+            this.elementsTreeOutline = new WebInspector.ElementsTreeOutline();
+            this.elementsTreeOutline.rootDOMNode = node;
+            break;
+        case WebInspector.ConsoleMessage.MessageLevel.Trace:
+            var span = document.createElement("span");
+            span.addStyleClass("console-formatted-trace");
+            var stack = Array.prototype.slice.call(arguments, 6);
+            var funcNames = stack.map(function(f) {
+                return f.name || WebInspector.UIString("(anonymous function)");
+            });
+            span.appendChild(document.createTextNode(funcNames.join("\n")));
+            this.formattedMessage = span;
+            break;
+        default:
+            // This _format call passes in true for the plainText argument. The result's textContent is
+            // used for inline message bubbles in SourceFrames, or other plain-text representations.
+            this.message = this._format(Array.prototype.slice.call(arguments, 6), true).textContent;
+
+            // The formatedMessage property is used for the rich and interactive console.
+            this.formattedMessage = this._format(Array.prototype.slice.call(arguments, 6));
+            break;
     }
-
-    // This _format call passes in true for the plainText argument. The result's textContent is
-    // used for inline message bubbles in SourceFrames, or other plain-text representations.
-    this.message = this._format(Array.prototype.slice.call(arguments, 6), true).textContent;
-
-    // The formatedMessage property is used for the rich and interactive console.
-    this.formattedMessage = this._format(Array.prototype.slice.call(arguments, 6));
 }
 
@@ -813 +827 @@
     Object: 4,
     Node: 5,
-    StartGroup: 6,
-    EndGroup: 7
+    Trace: 6,
+    StartGroup: 7,
+    EndGroup: 8
 }