<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161678] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161678">161678</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 14:16:17 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageConsolecpp">trunk/Source/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsolecpp">trunk/Source/WebCore/page/PageConsole.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleh">trunk/Source/WebCore/page/PageConsole.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161677 => 161678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 22:13:07 UTC (rev 161677)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 22:16:17 UTC (rev 161678)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fill in missing WebCoreThread function pointers
</span></span></pre></div>
<a id="trunkSourceWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Console.cpp (161677 => 161678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Console.cpp 2014-01-10 22:13:07 UTC (rev 161677)
+++ trunk/Source/WebCore/page/Console.cpp 2014-01-10 22:16:17 UTC (rev 161678)
</span><span class="lines">@@ -93,8 +93,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PageConsole::printSourceURLAndPosition(lastCaller.sourceURL(), lastCaller.lineNumber());
</span><del>- PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level);
</del><span class="cx">
</span><ins>+ printf(": ");
+
+ PageConsole::printMessageSourceAndLevelPrefix(ConsoleAPIMessageSource, level, printTrace);
+
</ins><span class="cx"> for (size_t i = 0; i < arguments->argumentCount(); ++i) {
</span><span class="cx"> String argAsString = arguments->argumentAt(i).toString(arguments->globalState());
</span><span class="cx"> printf(" %s", argAsString.utf8().data());
</span><span class="lines">@@ -102,12 +105,21 @@
</span><span class="cx">
</span><span class="cx"> printf("\n");
</span><span class="cx">
</span><del>- 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());
- }
</del><ins>+ 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");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.cpp (161677 => 161678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.cpp 2014-01-10 22:13:07 UTC (rev 161677)
+++ trunk/Source/WebCore/page/PageConsole.cpp 2014-01-10 22:16:17 UTC (rev 161678)
</span><span class="lines">@@ -68,13 +68,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (!sourceURL.isEmpty()) {
</span><span class="cx"> if (lineNumber > 0 && columnNumber > 0)
</span><del>- printf("%s:%u:%u: ", sourceURL.utf8().data(), lineNumber, columnNumber);
</del><ins>+ printf("%s:%u:%u", sourceURL.utf8().data(), lineNumber, columnNumber);
+ else if (lineNumber > 0)
+ printf("%s:%u", sourceURL.utf8().data(), lineNumber);
</ins><span class="cx"> else
</span><del>- printf("%s: ", sourceURL.utf8().data());
</del><ins>+ printf("%s", sourceURL.utf8().data());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsole::printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel level)
</del><ins>+void PageConsole::printMessageSourceAndLevelPrefix(MessageSource source, MessageLevel level, bool showAsTrace)
</ins><span class="cx"> {
</span><span class="cx"> const char* sourceString;
</span><span class="cx"> switch (source) {
</span><span class="lines">@@ -88,7 +90,7 @@
</span><span class="cx"> sourceString = "NETWORK";
</span><span class="cx"> break;
</span><span class="cx"> case ConsoleAPIMessageSource:
</span><del>- sourceString = "CONSOLEAPI";
</del><ins>+ sourceString = "CONSOLE";
</ins><span class="cx"> break;
</span><span class="cx"> case StorageMessageSource:
</span><span class="cx"> sourceString = "STORAGE";
</span><span class="lines">@@ -134,6 +136,9 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (showAsTrace)
+ levelString = "TRACE";
+
</ins><span class="cx"> printf("%s %s:", sourceString, levelString);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsole.h (161677 => 161678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsole.h 2014-01-10 22:13:07 UTC (rev 161677)
+++ trunk/Source/WebCore/page/PageConsole.h 2014-01-10 22:16:17 UTC (rev 161678)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> ~PageConsole();
</span><span class="cx">
</span><span class="cx"> static void printSourceURLAndPosition(const String& sourceURL, unsigned lineNumber, unsigned columnNumber = 0);
</span><del>- static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel);
</del><ins>+ static void printMessageSourceAndLevelPrefix(MessageSource, MessageLevel, bool showAsTrace = false);
</ins><span class="cx">
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> = 0, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>);
</span></span></pre>
</div>
</div>
</body>
</html>