<!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>[209366] 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/209366">209366</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-12-05 16:21:19 -0800 (Mon, 05 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Object.shallowEqual([{}], [{}]) should return true
https://bugs.webkit.org/show_bug.cgi?id=165397
Reviewed by Brian Burg.
Source/WebInspectorUI:
* UserInterface/Base/Utilities.js:
(value):
Array.shallowEqual should compare array items using strict equivalence,
and on failure defer to Object.shallowEqual.
LayoutTests:
Added passing and failing inputs for TestHarness.prototype.expectShallowEqual.
* inspector/unit-tests/test-harness-expect-functions-expected.txt:
* inspector/unit-tests/test-harness-expect-functions.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorunitteststestharnessexpectfunctionsexpectedtxt">trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunitteststestharnessexpectfunctionshtml">trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209365 => 209366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-06 00:10:58 UTC (rev 209365)
+++ trunk/LayoutTests/ChangeLog 2016-12-06 00:21:19 UTC (rev 209366)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Object.shallowEqual([{}], [{}]) should return true
+ https://bugs.webkit.org/show_bug.cgi?id=165397
+
+ Reviewed by Brian Burg.
+
+ Added passing and failing inputs for TestHarness.prototype.expectShallowEqual.
+
+ * inspector/unit-tests/test-harness-expect-functions-expected.txt:
+ * inspector/unit-tests/test-harness-expect-functions.html:
+
</ins><span class="cx"> 2016-12-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> pointer lock needs to be feature detectable
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunitteststestharnessexpectfunctionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-expected.txt (209365 => 209366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-expected.txt 2016-12-06 00:10:58 UTC (rev 209365)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions-expected.txt 2016-12-06 00:21:19 UTC (rev 209366)
</span><span class="lines">@@ -170,6 +170,9 @@
</span><span class="cx"> Expected to PASS
</span><span class="cx"> PASS: expectShallowEqual({"a":1,"b":2}, {"a":1,"b":2})
</span><span class="cx"> PASS: expectShallowEqual({}, {})
</span><ins>+PASS: expectShallowEqual([1,2], [1,2])
+PASS: expectShallowEqual([{"a":1},{"a":2}], [{"a":1},{"a":2}])
+PASS: expectShallowEqual([{}], [{}])
</ins><span class="cx"> PASS: expectShallowEqual([], [])
</span><span class="cx"> Expected to FAIL
</span><span class="cx"> FAIL: expectShallowEqual({"a":1,"b":2}, {"a":3,"b":4})
</span><span class="lines">@@ -178,11 +181,23 @@
</span><span class="cx"> FAIL: expectShallowEqual({}, [])
</span><span class="cx"> Expected: []
</span><span class="cx"> Actual: {}
</span><ins>+FAIL: expectShallowEqual([1,2], [3,4])
+ Expected: [3,4]
+ Actual: [1,2]
+FAIL: expectShallowEqual([{"a":1},{"a":2}], [{"a":3},{"a":4}])
+ Expected: [{"a":3},{"a":4}]
+ Actual: [{"a":1},{"a":2}]
+FAIL: expectShallowEqual([{"a":1},{"a":2}], [{"b":1},{"b":2}])
+ Expected: [{"b":1},{"b":2}]
+ Actual: [{"a":1},{"a":2}]
</ins><span class="cx">
</span><span class="cx"> -- Running test case: InspectorTest.expectNotShallowEqual
</span><span class="cx"> Expected to PASS
</span><span class="cx"> PASS: expectNotShallowEqual({"a":1,"b":2}, {"a":3,"b":4})
</span><span class="cx"> PASS: expectNotShallowEqual({}, [])
</span><ins>+PASS: expectNotShallowEqual([1,2], [3,4])
+PASS: expectNotShallowEqual([{"a":1},{"a":2}], [{"a":3},{"a":4}])
+PASS: expectNotShallowEqual([{"a":1},{"a":2}], [{"b":1},{"b":2}])
</ins><span class="cx"> Expected to FAIL
</span><span class="cx"> FAIL: expectNotShallowEqual({"a":1,"b":2}, {"a":1,"b":2})
</span><span class="cx"> Expected: not {"a":1,"b":2}
</span><span class="lines">@@ -190,6 +205,15 @@
</span><span class="cx"> FAIL: expectNotShallowEqual({}, {})
</span><span class="cx"> Expected: not {}
</span><span class="cx"> Actual: {}
</span><ins>+FAIL: expectNotShallowEqual([1,2], [1,2])
+ Expected: not [1,2]
+ Actual: [1,2]
+FAIL: expectNotShallowEqual([{"a":1},{"a":2}], [{"a":1},{"a":2}])
+ Expected: not [{"a":1},{"a":2}]
+ Actual: [{"a":1},{"a":2}]
+FAIL: expectNotShallowEqual([{}], [{}])
+ Expected: not [{}]
+ Actual: [{}]
</ins><span class="cx"> FAIL: expectNotShallowEqual([], [])
</span><span class="cx"> Expected: not []
</span><span class="cx"> Actual: []
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunitteststestharnessexpectfunctionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions.html (209365 => 209366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions.html 2016-12-06 00:10:58 UTC (rev 209365)
+++ trunk/LayoutTests/inspector/unit-tests/test-harness-expect-functions.html 2016-12-06 00:21:19 UTC (rev 209366)
</span><span class="lines">@@ -91,11 +91,17 @@
</span><span class="cx"> passingInputs: [
</span><span class="cx"> [{a: 1, b: 2}, {a: 1, b: 2}],
</span><span class="cx"> [{}, {}],
</span><ins>+ [[1, 2], [1, 2]],
+ [[{a: 1}, {a: 2}], [{a: 1}, {a: 2}]],
+ [[{}], [{}]],
</ins><span class="cx"> [[], []],
</span><span class="cx"> ],
</span><span class="cx"> failingInputs: [
</span><span class="cx"> [{a: 1, b: 2}, {a: 3, b: 4}],
</span><span class="cx"> [{}, []],
</span><ins>+ [[1, 2], [3, 4]],
+ [[{a: 1}, {a: 2}], [{a: 3}, {a: 4}]],
+ [[{a: 1}, {a: 2}], [{b: 1}, {b: 2}]],
</ins><span class="cx"> ]
</span><span class="cx"> };
</span><span class="cx"> addTestCase(expectShallowEqualTestCase);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (209365 => 209366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-06 00:10:58 UTC (rev 209365)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-06 00:21:19 UTC (rev 209366)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Object.shallowEqual([{}], [{}]) should return true
+ https://bugs.webkit.org/show_bug.cgi?id=165397
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Base/Utilities.js:
+ (value):
+ Array.shallowEqual should compare array items using strict equivalence,
+ and on failure defer to Object.shallowEqual.
+
</ins><span class="cx"> 2016-12-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove legacy styles
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (209365 => 209366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-12-06 00:10:58 UTC (rev 209365)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-12-06 00:21:19 UTC (rev 209366)
</span><span class="lines">@@ -447,8 +447,11 @@
</span><span class="cx"> if (length !== b.length)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- for (var i = 0; i < length; ++i) {
- if (a[i] !== b[i])
</del><ins>+ for (let i = 0; i < length; ++i) {
+ if (a[i] === b[i])
+ continue;
+
+ if (!Object.shallowEqual(a[i], b[i]))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>