<!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>[200535] 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/200535">200535</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-06 20:08:18 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve console.count()
https://bugs.webkit.org/show_bug.cgi?id=157439
<rdar://problem/26152654>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-06
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
- make console.count() increment an unnamed global counter.
- make console.count(label) increment a counter with that label name.
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::count):
LayoutTests:
* inspector/console/console-api-expected.txt:
* inspector/console/console-count-expected.txt: Added.
* inspector/console/console-count.html: Added.
* inspector/console/console-time.html:</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="#trunkLayoutTestsinspectorconsoleconsoletimehtml">trunk/LayoutTests/inspector/console/console-time.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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorconsoleconsolecountexpectedtxt">trunk/LayoutTests/inspector/console/console-count-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsolecounthtml">trunk/LayoutTests/inspector/console/console-count.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200534 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
+++ trunk/LayoutTests/ChangeLog 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve console.count()
+ https://bugs.webkit.org/show_bug.cgi?id=157439
+ <rdar://problem/26152654>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/console/console-api-expected.txt:
+ * inspector/console/console-count-expected.txt: Added.
+ * inspector/console/console-count.html: Added.
+ * inspector/console/console-time.html:
+
</ins><span class="cx"> 2016-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-api-expected.txt (200534 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-05-07 00:05:58 UTC (rev 200534)
+++ trunk/LayoutTests/inspector/console/console-api-expected.txt 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_source": "console-api",
</span><span class="cx"> "_level": "debug",
</span><del>- "_messageText": "<no label>: 1",
</del><ins>+ "_messageText": "Global: 1",
</ins><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="cx"> "_line": 3,
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_source": "console-api",
</span><span class="cx"> "_level": "debug",
</span><del>- "_messageText": "<no label>: 2",
</del><ins>+ "_messageText": "Global: 2",
</ins><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="cx"> "_line": 3,
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_source": "console-api",
</span><span class="cx"> "_level": "debug",
</span><del>- "_messageText": "<no label>: 3",
</del><ins>+ "_messageText": ": 1",
</ins><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="cx"> "_line": 3,
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> "_listeners": null,
</span><span class="cx"> "_source": "console-api",
</span><span class="cx"> "_level": "debug",
</span><del>- "_messageText": "<no label>: 4",
</del><ins>+ "_messageText": ": 2",
</ins><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="cx"> "_line": 3,
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsolecountexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/console/console-count-expected.txt (0 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-count-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/console/console-count-expected.txt 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+Tests for the console.count API.
+
+
+== Running test suite: console.count
+-- Running test case: NoArguments
+Global: 1
+Global: 2
+Global: 3
+Global: 4
+Global: 5
+Global: 6
+Global: 7
+Global: 8
+Global: 9
+Global: 10
+Global: 11
+Global: 12
+Global: 13
+Global: 14
+Global: 15
+Global: 16
+
+-- Running test case: WithLabel
+alpha: 1
+alpha: 2
+beta: 1
+alpha: 3
+alpha: 4
+alpha: 5
+beta: 2
+alpha: 6
+alpha: 7
+alpha: 8
+beta: 3
+alpha: 9
+alpha: 10
+alpha: 11
+beta: 4
+alpha: 12
+alpha: 13
+alpha: 14
+beta: 5
+alpha: 15
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsolecounthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/console/console-count.html (0 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-count.html (rev 0)
+++ trunk/LayoutTests/inspector/console/console-count.html 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function triggerCountNoArguments() {
+ for (let i = 0; i < 10; ++i) {
+ console.count();
+ if (i % 2)
+ console.count();
+ }
+}
+
+function triggerLabeledCounters() {
+ for (let i = 0; i < 10; ++i) {
+ console.count("alpha");
+ if (i % 2) {
+ console.count("beta");
+ console.count("alpha");
+ }
+ }
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("console.count");
+
+ suite.addTestCase({
+ name: "NoArguments",
+ description: "No arguments increments a shared global counter.",
+ test: (resolve, reject) => {
+ let seen = 0;
+ const expected = 16;
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
+ function handler(event) {
+ let message = event.data.message;
+ InspectorTest.log(message.messageText);
+ if (++seen === expected) {
+ WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
+ resolve();
+ }
+ }
+
+ InspectorTest.evaluateInPage("triggerCountNoArguments()"); // 15
+ InspectorTest.evaluateInPage("console.count()"); // 1
+ }
+ });
+
+ suite.addTestCase({
+ name: "WithLabel",
+ description: "Labeled counters increment the label.",
+ test: (resolve, reject) => {
+ let seen = 0;
+ const expected = 20;
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
+ function handler(event) {
+ let message = event.data.message;
+ InspectorTest.log(message.messageText);
+ if (++seen === expected) {
+ WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
+ resolve();
+ }
+ }
+
+ InspectorTest.evaluateInPage("triggerLabeledCounters()");
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests for the console.count API.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoletimehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-time.html (200534 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-time.html 2016-05-07 00:05:58 UTC (rev 200534)
+++ trunk/LayoutTests/inspector/console/console-time.html 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> if (++seen === expected) {
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="cx"> resolve();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorTest.evaluateInPage("console.time()");
</span><span class="lines">@@ -39,8 +39,6 @@
</span><span class="cx"> name: "UserLabels",
</span><span class="cx"> description: "Test that user labels works as expected.",
</span><span class="cx"> test: (resolve, reject) => {
</span><del>- let seen = 0;
- const expected = 3;
</del><span class="cx"> WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</span><span class="cx"> let message = event.data.message;
</span><span class="cx"> InspectorTest.expectThat(message.type === WebInspector.ConsoleMessage.MessageType.Timing, "Should receive a Timing type message.");
</span><span class="lines">@@ -68,7 +66,7 @@
</span><span class="cx"> if (++seen === expected) {
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="cx"> resolve();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorTest.evaluateInPage("console.time('my-label-1')");
</span><span class="lines">@@ -94,7 +92,7 @@
</span><span class="cx"> if (message.type === WebInspector.ConsoleMessage.MessageType.Timing) {
</span><span class="cx"> WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.MessageAdded, handler);
</span><span class="cx"> resolve();
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorTest.evaluateInPage("console.time()");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200534 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-07 00:05:58 UTC (rev 200534)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve console.count()
+ https://bugs.webkit.org/show_bug.cgi?id=157439
+ <rdar://problem/26152654>
+
+ Reviewed by Timothy Hatcher.
+
+ - make console.count() increment an unnamed global counter.
+ - make console.count(label) increment a counter with that label name.
+
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::count):
+
</ins><span class="cx"> 2016-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (200534 => 200535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2016-05-07 00:05:58 UTC (rev 200534)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2016-05-07 03:08:18 UTC (rev 200535)
</span><span class="lines">@@ -179,30 +179,26 @@
</span><span class="cx"> void InspectorConsoleAgent::count(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(state, ScriptCallStack::maxCallStackSizeToCapture));
</span><del>- const ScriptCallFrame& lastCaller = callStack->at(0);
- // Follow Firebug's behavior of counting with null and undefined title in
- // the same bucket as no argument
- String title;
- arguments->getFirstArgumentAsString(title);
- String identifier = title + '@' + lastCaller.sourceURL() + ':' + String::number(lastCaller.lineNumber());
</del><span class="cx">
</span><del>- HashMap<String, unsigned>::iterator it = m_counts.find(identifier);
- int count;
- if (it == m_counts.end())
- count = 1;
- else {
- count = it->value + 1;
- m_counts.remove(it);
</del><ins>+ String title;
+ String identifier;
+ if (!arguments->argumentCount()) {
+ // '@' prefix for engine generated labels.
+ title = ASCIILiteral("Global");
+ identifier = makeString('@', title);
+ } else {
+ // '#' prefix for user labels.
+ arguments->getFirstArgumentAsString(title);
+ identifier = makeString('#', title);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_counts.add(identifier, count);
</del><ins>+ auto result = m_counts.add(identifier, 1);
+ if (!result.isNewEntry)
+ result.iterator->value += 1;
</ins><span class="cx">
</span><del>- String message;
- if (title.isEmpty())
- message = "<no label>: " + String::number(count);
- else
- message = title + ": " + String::number(count);
</del><ins>+ // FIXME: Web Inspector should have a better UI for counters, but for now we just log an updated counter value.
</ins><span class="cx">
</span><ins>+ String message = makeString(title, ": ", String::number(result.iterator->value));
</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>