<!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>[166439] trunk</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/166439">166439</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-28 17:30:39 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: console.warn is showing as error instead of warning
https://bugs.webkit.org/show_bug.cgi?id=130921
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-03-28
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* runtime/ConsolePrototype.cpp:
(JSC::consoleProtoFuncWarn):
console.warn should be MessageLevel Warning, not Error.
Source/WebInspectorUI:
* UserInterface/Models/DefaultDashboard.js:
(WebInspector.DefaultDashboard.prototype._incrementConsoleMessageType):
Use our enums instead of hardcoded strings.
LayoutTests:
Add a test for console.log, warn, error, etc to make sure they get
to the frontend with the expected source and level.
* inspector-protocol/console/console-message-expected.txt: Added.
* inspector-protocol/console/console-message.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsolePrototypecpp">trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs">trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/inspector-protocol/console/</li>
<li><a href="#trunkLayoutTestsinspectorprotocolconsoleconsolemessageexpectedtxt">trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolconsoleconsolemessagehtml">trunk/LayoutTests/inspector-protocol/console/console-message.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166438 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-29 00:17:02 UTC (rev 166438)
+++ trunk/LayoutTests/ChangeLog 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: console.warn is showing as error instead of warning
+ https://bugs.webkit.org/show_bug.cgi?id=130921
+
+ Reviewed by Timothy Hatcher.
+
+ Add a test for console.log, warn, error, etc to make sure they get
+ to the frontend with the expected source and level.
+
+ * inspector-protocol/console/console-message-expected.txt: Added.
+ * inspector-protocol/console/console-message.html: Added.
+
</ins><span class="cx"> 2014-03-28 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: expose what elements get generic "clickable" status
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolconsoleconsolemessageexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt (0 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+CONSOLE MESSAGE: line 7: log
+CONSOLE MESSAGE: line 8: info
+CONSOLE MESSAGE: line 9: warn
+CONSOLE MESSAGE: line 10: error
+CONSOLE MESSAGE: line 11: debug
+Tests that console log messages make it to the frontend and have expected source, type, and levels.
+{"source":"console-api","level":"log","text":"log","location":"console-message.html:7:16","parameters":[{"type":"string"}]}
+{"source":"console-api","level":"log","text":"info","location":"console-message.html:8:17","parameters":[{"type":"string"}]}
+{"source":"console-api","level":"warning","text":"warn","location":"console-message.html:9:17","parameters":[{"type":"string"}]}
+{"source":"console-api","level":"error","text":"error","location":"console-message.html:10:18","parameters":[{"type":"string"}]}
+{"source":"console-api","level":"debug","text":"debug","location":"console-message.html:11:18","parameters":[{"type":"string"}]}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolconsoleconsolemessagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/console/console-message.html (0 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/console/console-message.html (rev 0)
+++ trunk/LayoutTests/inspector-protocol/console/console-message.html 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<html>
+<head>
+<script type="text/javascript" src="../../http/tests/inspector-protocol/resources/protocol-test.js"></script>
+<script>
+function generateSimpleConsoleMessages()
+{
+ console.log("log");
+ console.info("info"); // Alias of log.
+ console.warn("warn");
+ console.error("error");
+ console.debug("debug");
+}
+
+function test()
+{
+ InspectorTest.importScript("../../../../inspector-protocol/resources/console-helper.js");
+
+ InspectorTest.sendCommand("Console.enable", {});
+ InspectorTest.sendCommand("Runtime.evaluate", {expression: "generateSimpleConsoleMessages()"});
+
+ var consoleMessageCount = 0;
+ const expectedConsoleMessages = 5;
+
+ InspectorTest.eventHandler["Console.messageAdded"] = function(messageObject)
+ {
+ var simplifiedMessage = ConsoleHelper.simplifiedConsoleMessage(messageObject);
+ InspectorTest.log(JSON.stringify(simplifiedMessage));
+
+ if (++consoleMessageCount === expectedConsoleMessages)
+ InspectorTest.completeTest();
+ }
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>
+Tests that console log messages make it to the frontend and have expected source, type, and levels.<br>
+</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166438 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-29 00:17:02 UTC (rev 166438)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: console.warn is showing as error instead of warning
+ https://bugs.webkit.org/show_bug.cgi?id=130921
+
+ Reviewed by Timothy Hatcher.
+
+ * runtime/ConsolePrototype.cpp:
+ (JSC::consoleProtoFuncWarn):
+ console.warn should be MessageLevel Warning, not Error.
+
</ins><span class="cx"> 2014-03-28 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix cloop build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsolePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp (166438 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp 2014-03-29 00:17:02 UTC (rev 166438)
+++ trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncWarn(ExecState* exec)
</span><span class="cx"> {
</span><del>- return consoleLogWithLevel(exec, MessageLevel::Error);
</del><ins>+ return consoleLogWithLevel(exec, MessageLevel::Warning);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncClear(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166438 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-29 00:17:02 UTC (rev 166438)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: console.warn is showing as error instead of warning
+ https://bugs.webkit.org/show_bug.cgi?id=130921
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/DefaultDashboard.js:
+ (WebInspector.DefaultDashboard.prototype._incrementConsoleMessageType):
+ Use our enums instead of hardcoded strings.
+
</ins><span class="cx"> 2014-03-28 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: AXI: expose what elements get generic "clickable" status
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDefaultDashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js (166438 => 166439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2014-03-29 00:17:02 UTC (rev 166438)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2014-03-29 00:30:39 UTC (rev 166439)
</span><span class="lines">@@ -249,13 +249,13 @@
</span><span class="cx"> _incrementConsoleMessageType: function(type, increment)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><del>- case "log":
</del><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Log:
</ins><span class="cx"> this.logs += increment;
</span><span class="cx"> break;
</span><del>- case "warning":
</del><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Warning:
</ins><span class="cx"> this.issues += increment;
</span><span class="cx"> break;
</span><del>- case "error":
</del><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Error:
</ins><span class="cx"> this.errors += increment;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>