<!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>[194887] 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/194887">194887</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-11 23:39:16 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: console.count() shouldn't show a colon in front of a number
https://bugs.webkit.org/show_bug.cgi?id=152038
Patch by Johan K. Jensen <jj@johanjensen.dk> on 2016-01-11
Reviewed by Brian Burg.
Source/JavaScriptCore:
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::count):
Do not include title and colon if the title is empty.
LayoutTests:
* inspector/console/console-api-expected.txt:
* inspector/console/console-api.html:
Add testcases for console.count</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt">trunk/LayoutTests/inspector/console/console-api-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoleapihtml">trunk/LayoutTests/inspector/console/console-api.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194886 => 194887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-12 07:16:04 UTC (rev 194886)
+++ trunk/LayoutTests/ChangeLog 2016-01-12 07:39:16 UTC (rev 194887)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-11 Johan K. Jensen <jj@johanjensen.dk>
+
+ Web Inspector: console.count() shouldn't show a colon in front of a number
+ https://bugs.webkit.org/show_bug.cgi?id=152038
+
+ Reviewed by Brian Burg.
+
+ * inspector/console/console-api-expected.txt:
+ * inspector/console/console-api.html:
+ Add testcases for console.count
+
</ins><span class="cx"> 2016-01-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> keywords ("super", "delete", etc) should be valid method names
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-api-expected.txt (194886 => 194887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-01-12 07:16:04 UTC (rev 194886)
+++ trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-01-12 07:39:16 UTC (rev 194887)
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> {
</span><span class="cx"> "_source": "console-api",
</span><span class="cx"> "_level": "debug",
</span><del>- "_messageText": ": 1",
</del><ins>+ "_messageText": "<no label>: 1",
</ins><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="cx"> "_line": 1,
</span><span class="lines">@@ -595,3 +595,185 @@
</span><span class="cx"> "_request": null
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+STEP: console.count()
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "<no label>: 2",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count('')
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "<no label>: 3",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(' ')
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": " : 1",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count('')
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "<no label>: 4",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(' ')
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": " : 2",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(string)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "string: 1",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(string)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "string: 2",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(object)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "[object Object]: 1",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(object)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "[object Object]: 2",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(otherObject)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "[object Object]: 3",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(otherObject)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "[object Object]: 4",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(number)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "42: 1",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
+STEP: console.count(number)
+{
+ "_source": "console-api",
+ "_level": "debug",
+ "_messageText": "42: 2",
+ "_type": "log",
+ "_url": null,
+ "_line": 1,
+ "_column": 14,
+ "_repeatCount": 1,
+ "_stackTrace": "<filtered>",
+ "_request": null
+}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoleapihtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-api.html (194886 => 194887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-api.html 2016-01-12 07:16:04 UTC (rev 194886)
+++ trunk/LayoutTests/inspector/console/console-api.html 2016-01-12 07:39:16 UTC (rev 194887)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> <script>
</span><span class="cx"> var string = "string";
</span><span class="cx"> var object = {a:1};
</span><ins>+var otherObject = {b:2};
+var number = 42;
</ins><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="lines">@@ -31,6 +33,19 @@
</span><span class="cx"> "console.groupCollapsed('collapsedGroupName')",
</span><span class="cx"> "console.groupEnd('collapsedGroupName')",
</span><span class="cx"> "console.count()",
</span><ins>+ "console.count()",
+ "console.count('')",
+ "console.count(' ')",
+ "console.count('')",
+ "console.count(' ')",
+ "console.count(string)",
+ "console.count(string)",
+ "console.count(object)",
+ "console.count(object)",
+ "console.count(otherObject)",
+ "console.count(otherObject)",
+ "console.count(number)",
+ "console.count(number)",
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> function remoteObjectJSONFilter(key, value)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194886 => 194887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-12 07:16:04 UTC (rev 194886)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-12 07:39:16 UTC (rev 194887)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-11 Johan K. Jensen <jj@johanjensen.dk>
+
+ Web Inspector: console.count() shouldn't show a colon in front of a number
+ https://bugs.webkit.org/show_bug.cgi?id=152038
+
+ Reviewed by Brian Burg.
+
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::count):
+ Do not include title and colon if the title is empty.
+
</ins><span class="cx"> 2016-01-11 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Reverted r194317.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (194886 => 194887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2016-01-12 07:16:04 UTC (rev 194886)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2016-01-12 07:39:16 UTC (rev 194887)
</span><span class="lines">@@ -174,7 +174,12 @@
</span><span class="cx">
</span><span class="cx"> m_counts.add(identifier, count);
</span><span class="cx">
</span><del>- String message = title + ": " + String::number(count);
</del><ins>+ String message;
+ if (title.isEmpty())
+ message = "<no label>: " + String::number(count);
+ else
+ message = title + ": " + String::number(count);
+
</ins><span class="cx"> addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Debug, message, callStack));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>