Changeset 161678 in webkit

Timestamp:

Jan 10, 2014 2:16:17 PM (10 years ago)

Author:

timothy@apple.com

Message:

Clean up and fix some issues with stdout formatting of console messages.

• Fix URLs not printing line numbers unless column number is > 0.
• Change "CONSOLEAPI" to "CONSOLE" for the source.
• Clean up how console.trace outputs and print URL, line and column for each frame.
• Print "(unknown)" for anonymous and native code call frames.

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

Reviewed by Joseph Pecoraro.

• page/Console.cpp:

(WebCore::internalAddMessage):

• page/PageConsole.cpp:

(WebCore::PageConsole::printSourceURLAndPosition):
(WebCore::PageConsole::printMessageSourceAndLevelPrefix):

• page/PageConsole.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Console.cpp (modified) (2 diffs)
• page/PageConsole.cpp (modified) (3 diffs)
• page/PageConsole.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Timothy Hatcher  <timothy@apple.com>
+
+        Clean up and fix some issues with stdout formatting of console messages.
+
+        * Fix URLs not printing line numbers unless column number is > 0.
+        * Change "CONSOLEAPI" to "CONSOLE" for the source.
+        * Clean up how console.trace outputs and print URL, line and column for each frame.
+        * Print "(unknown)" for anonymous and native code call frames.
+
+        https://bugs.webkit.org/show_bug.cgi?id=126767
+
+        Reviewed by Joseph Pecoraro.
+
+        * page/Console.cpp:
+        (WebCore::internalAddMessage):
+        * page/PageConsole.cpp:
+        (WebCore::PageConsole::printSourceURLAndPosition):
+        (WebCore::PageConsole::printMessageSourceAndLevelPrefix):
+        * page/PageConsole.h:
+
 2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/page/Console.cpp

@@ -94 +94 @@
 
     PageConsole::printSourceURLAndPosition(lastCaller.sourceURL(), lastCaller.lineNumber());
-    PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level);
+
+    printf(": ");
+
+    PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level, printTrace);
 
     for (size_t i = 0; i < arguments->argumentCount(); ++i) {
@@ -103 +106 @@
     printf("\n");
 
-    if (printTrace) {
-        printf("Stack Trace\n");
-        for (size_t i = 0; i < callStack->size(); ++i) {
-            String functionName = String(callStack->at(i).functionName());
-            printf("\t%s\n", functionName.utf8().data());
-        }
+    if (!printTrace)
+        return;
+
+    for (size_t i = 0; i < callStack->size(); ++i) {
+        const ScriptCallFrame& callFrame = callStack->at(i);
+
+        String functionName = String(callFrame.functionName());
+        if (functionName.isEmpty())
+            functionName = ASCIILiteral("(unknown)");
+
+        printf("%lu: %s (", i, functionName.utf8().data());
+
+        PageConsole::printSourceURLAndPosition(callFrame.sourceURL(), callFrame.lineNumber());
+
+        printf(")\n");
     }
 }

trunk/Source/WebCore/page/PageConsole.cpp

@@ -69 +69 @@
     if (!sourceURL.isEmpty()) {
         if (lineNumber > 0 && columnNumber > 0)
-            printf("%s:%u:%u: ", sourceURL.utf8().data(), lineNumber, columnNumber);
+            printf("%s:%u:%u", sourceURL.utf8().data(), lineNumber, columnNumber);
+        else if (lineNumber > 0)
+            printf("%s:%u", sourceURL.utf8().data(), lineNumber);
         else
-            printf("%s: ", sourceURL.utf8().data());
-    }
-}
-
-void PageConsole::printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel level)
+            printf("%s", sourceURL.utf8().data());
+    }
+}
+
+void PageConsole::printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel level, bool showAsTrace)
 {
     const char* sourceString;
@@ -89 +91 @@
         break;
     case ConsoleAPIMessageSource:
-        sourceString = "CONSOLEAPI";
+        sourceString = "CONSOLE";
         break;
     case StorageMessageSource:
@@ -134 +136 @@
         break;
     }
+
+    if (showAsTrace)
+        levelString = "TRACE";
 
     printf("%s %s:", sourceString, levelString);

trunk/Source/WebCore/page/PageConsole.h

@@ -50 +50 @@
 
     static void printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber = 0);
-    static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel);
+    static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel, bool showAsTrace = false);
 
     void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> = 0, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);