<!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>[193448] branches/safari-601.1.46-branch</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/193448">193448</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 12:53:11 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186891">r186891</a>. rdar://problem/23581597</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformwinTestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorCommandLineAPIModuleSourcejs">branches/safari-601.1.46-branch/Source/WebCore/inspector/CommandLineAPIModuleSource.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsinspectorconsolecommandlineapiexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsinspectorconsolecommandlineapihtml">branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsplatformeflinspectorconsolecommandlineapiexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/platform/efl/inspector/console/command-line-api-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformmacinspectorconsolecommandlineapiexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/platform/mac/inspector/console/command-line-api-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186891. rdar://problem/23581597
+
+ 2015-07-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: update $$() to return an Array
+ https://bugs.webkit.org/show_bug.cgi?id=146964
+
+ Reviewed by Brian Burg.
+
+ * inspector/console/command-line-api-expected.txt: Added.
+ * inspector/console/command-line-api.html: Added.
+ Add back a command line api test.
+
+ * platform/efl/inspector/console/command-line-api-expected.txt: Removed.
+ * platform/mac/inspector/console/command-line-api-expected.txt: Removed.
+ Remove old platform expected results for the old version of this test.
+
+ * platform/win/TestExpectations:
+ Speculatively skipping on Windows since other inspector/console tests are skipped.
+
+2015-12-04 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189104. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsinspectorconsolecommandlineapiexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api-expected.txt (0 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api-expected.txt 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+CONSOLE MESSAGE: line 27: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
+Tests that command line api works.
+
+
+STEP: String(keys([3,4]))
+0,1
+
+STEP: String(values([3,4]))
+3,4
+
+STEP: String($0)
+[object HTMLParagraphElement]
+
+STEP: String($('foo'))
+CONSOLE: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
+null
+
+STEP: String($('#foo'))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', document.body))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', 'non-node'))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', $('#bar')))
+null
+
+STEP: String($$('p'))
+[object HTMLParagraphElement],[object HTMLParagraphElement]
+
+STEP: String($$('p', document.body))
+[object HTMLParagraphElement],[object HTMLParagraphElement]
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsinspectorconsolecommandlineapihtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api.html (0 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/inspector/console/command-line-api.html 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function test()
+{
+ var currentStepIndex = 0;
+ var steps = [
+ "String(keys([3,4]))",
+ "String(values([3,4]))",
+ "String($0)",
+ "String($('foo'))",
+ "String($('#foo'))",
+ "String($('#foo', document.body))",
+ "String($('#foo', 'non-node'))",
+ "String($('#foo', $('#bar')))",
+ "String($$('p'))",
+ "String($$('p', document.body))",
+ ];
+
+ var consoleMessage = null;
+
+ function runSteps()
+ {
+ for (var step of steps) {
+ WebInspector.runtimeManager.evaluateInInspectedWindow(step, "test", true, true, false, false, false, function(result, wasThrown) {
+ InspectorTest.log("\nSTEP: " + steps[currentStepIndex]);
+ if (consoleMessage) {
+ InspectorTest.log("CONSOLE: " + consoleMessage.messageText);
+ consoleMessage = null;
+ }
+ InspectorTest.log(result.description);
+
+ if (++currentStepIndex >= steps.length)
+ InspectorTest.completeTest();
+ });
+ }
+ }
+
+ // Detect console warning for $('foo').
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
+ consoleMessage = event.data.message;
+ InspectorTest.assert(consoleMessage instanceof WebInspector.ConsoleMessage);
+ });
+
+ // Select div#foo for $0.
+ WebInspector.domTreeManager.requestDocument(function(documentNode) {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#foo", function(contentNodeId) {
+ if (contentNodeId) {
+ ConsoleAgent.addInspectedNode(contentNodeId);
+ runSteps();
+ } else {
+ InspectorTest.log("FAIL: DOM node not found.");
+ InspectorTest.completeTest();
+ }
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest();">
+ <p id="foo">Tests that command line api works.</p>
+ <p id="bar"></p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformeflinspectorconsolecommandlineapiexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/efl/inspector/console/command-line-api-expected.txt (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/efl/inspector/console/command-line-api-expected.txt 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/efl/inspector/console/command-line-api-expected.txt 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 1225: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
-Tests that command line api works.
-
-
-
-String($0)
-"[object HTMLParagraphElement]"
-
-
-$3
-undefined
-
-
-String(keys([3,4]))
-"0,1"
-
-
-String(values([3,4]))
-"3,4"
-
-
-String($('#foo'))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', document.body))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', 'non-node'))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', $('#bar')))
-"null"
-
-
-String($$('p#foo'))
-"[object NodeList]"
-
-
-String($$('p#foo', document.body))
-"[object NodeList]"
-
-
-String($('foo'))
-The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#foo")
-
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformmacinspectorconsolecommandlineapiexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1.46-branch/LayoutTests/platform/mac/inspector/console/command-line-api-expected.txt (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/mac/inspector/console/command-line-api-expected.txt 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/mac/inspector/console/command-line-api-expected.txt 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-CONSOLE MESSAGE: line 180: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
-Tests that command line api works.
-
-
-
-String($0)
-"[object HTMLParagraphElement]"
-
-
-$3
-undefined
-
-
-String(keys([3,4]))
-"0,1"
-
-
-String(values([3,4]))
-"3,4"
-
-
-String($('#foo'))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', document.body))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', 'non-node'))
-"[object HTMLParagraphElement]"
-
-
-String($('#foo', $('#bar')))
-"null"
-
-
-String($$('p#foo'))
-"[object NodeList]"
-
-
-String($$('p#foo', document.body))
-"[object NodeList]"
-
-
-String($('foo'))
-The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#foo")
-
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -2374,6 +2374,7 @@
</span><span class="cx"> inspector-protocol/debugger/removeBreakpoint.html [ Skip ] # Crashing
</span><span class="cx"> inspector-protocol/debugger/searchInContent-linebreaks.html [ Pass Crash ] # Flaky
</span><span class="cx">
</span><ins>+webkit.org/b/143548 inspector/console/command-line-api.html [ Skip ] # Timeout
</ins><span class="cx"> webkit.org/b/143548 inspector/console/console-api.html [ Skip ] # Timeout
</span><span class="cx"> webkit.org/b/143548 inspector/console/console-table.html [ Skip ] # Timeout
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-04 Timothy Hatcher <timothy@apple.com>
+
+ Merge r186891. rdar://problem/23581597
+
+ 2015-07-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: update $$() to return an Array
+ https://bugs.webkit.org/show_bug.cgi?id=146964
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/console/command-line-api.html
+
+ * inspector/CommandLineAPIModuleSource.js:
+ Update $$(...) to return an array.
+ Also InjectedScriptHost.type was renamed to subtype
+ a while ago.
+
</ins><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191967. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorCommandLineAPIModuleSourcejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/CommandLineAPIModuleSource.js (193447 => 193448)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/CommandLineAPIModuleSource.js 2015-12-04 20:53:02 UTC (rev 193447)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/CommandLineAPIModuleSource.js 2015-12-04 20:53:11 UTC (rev 193448)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if (selector && selector[0] !== "#") {
</span><span class="cx"> result = inspectedWindow.document.getElementById(selector);
</span><span class="cx"> if (result) {
</span><del>- inspectedWindow.console.warn("The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(\"#%s\")", selector );
</del><ins>+ inspectedWindow.console.warn("The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(\"#%s\")", selector);
</ins><span class="cx"> return null;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx"> $$: function (selector, start)
</span><span class="cx"> {
</span><span class="cx"> if (this._canQuerySelectorOnNode(start))
</span><del>- return start.querySelectorAll(selector);
- return inspectedWindow.document.querySelectorAll(selector);
</del><ins>+ return slice(start.querySelectorAll(selector));
+ return slice(inspectedWindow.document.querySelectorAll(selector));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> */
</span><span class="cx"> _canQuerySelectorOnNode: function(node)
</span><span class="cx"> {
</span><del>- return !!node && InjectedScriptHost.type(node) === "node" && (node.nodeType === Node.ELEMENT_NODE || node.nodeType === Node.DOCUMENT_NODE || node.nodeType === Node.DOCUMENT_FRAGMENT_NODE);
</del><ins>+ return !!node && InjectedScriptHost.subtype(node) === "node" && (node.nodeType === Node.ELEMENT_NODE || node.nodeType === Node.DOCUMENT_NODE || node.nodeType === Node.DOCUMENT_FRAGMENT_NODE);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>