<!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>[205815] 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/205815">205815</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 11:35:40 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Object.shallowEqual() should return false if object prototype chains differ
https://bugs.webkit.org/show_bug.cgi?id=161852
Reviewed by Joseph Pecoraro.
Source/WebInspectorUI:
Improve Object.shallowEqual so it won't produce false positives.
* UserInterface/Base/Utilities.js:
(value):
Object.shallowEqual should return false for non-array arguments.
Since typeof null === "object", use `instanceof` instead to avoid separate
null checks. Also use Array.shallowEqual fast path when both arguments are arrays.
LayoutTests:
* inspector/unit-tests/object-utilities-expected.txt: Added.
* inspector/unit-tests/object-utilities.html: Added.
Add test coverage for Object.shallowEqual.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorunittestsobjectutilitiesexpectedtxt">trunk/LayoutTests/inspector/unit-tests/object-utilities-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsobjectutilitieshtml">trunk/LayoutTests/inspector/unit-tests/object-utilities.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205814 => 205815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-12 18:18:05 UTC (rev 205814)
+++ trunk/LayoutTests/ChangeLog 2016-09-12 18:35:40 UTC (rev 205815)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-12 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Object.shallowEqual() should return false if object prototype chains differ
+ https://bugs.webkit.org/show_bug.cgi?id=161852
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/unit-tests/object-utilities-expected.txt: Added.
+ * inspector/unit-tests/object-utilities.html: Added.
+ Add test coverage for Object.shallowEqual.
+
</ins><span class="cx"> 2016-09-12 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking accessibility/mac/value-change/value-change-user-info-contenteditable.html as flaky on mac-wk2.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsobjectutilitiesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/object-utilities-expected.txt (0 => 205815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/object-utilities-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/object-utilities-expected.txt 2016-09-12 18:35:40 UTC (rev 205815)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+
+== Running test suite: ObjectUtilities
+-- Running test case: Object.shallowEqual
+PASS: shallowEqual of empty object literals should be true.
+PASS: shallowEqual of empty array literals should be true.
+PASS: shallowEqual of empty array and object literals should be false.
+PASS: shallowEqual of an object with itself should be true.
+PASS: shallowEqual of equal objects should be true.
+PASS: shallowEqual of equal objects should be true.
+PASS: shallowEqual of inequal objects should be false.
+PASS: shallowEqual of inequal objects should be false.
+PASS: shallowEqual of an object and null should be false.
+PASS: shallowEqual of an object and non-object should be false.
+PASS: shallowEqual of a non-object with itself should be false.
+PASS: shallowEqual of non-objects should be false.
+PASS: shallowEqual of objects with equal constructors should be true.
+PASS: shallowEqual of objects with different constructors should be false.
+PASS: shallowEqual of objects with different constructors should be false.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsobjectutilitieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/object-utilities.html (0 => 205815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/object-utilities.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/object-utilities.html 2016-09-12 18:35:40 UTC (rev 205815)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+
+function test()
+{
+ let suite = InspectorTest.createSyncSuite("ObjectUtilities");
+
+ suite.addTestCase({
+ name: "Object.shallowEqual",
+ test: () => {
+ InspectorTest.expectThat(Object.shallowEqual({}, {}), "shallowEqual of empty object literals should be true.");
+ InspectorTest.expectThat(Object.shallowEqual([], []), "shallowEqual of empty array literals should be true.");
+ InspectorTest.expectThat(!Object.shallowEqual([], {}), "shallowEqual of empty array and object literals should be false.");
+
+ let obj1 = {a: 1, b: 2};
+ InspectorTest.expectThat(Object.shallowEqual(obj1, obj1), "shallowEqual of an object with itself should be true.");
+
+ let obj2 = {a: 1, b: 2};
+ InspectorTest.expectThat(Object.shallowEqual(obj1, obj2), "shallowEqual of equal objects should be true.");
+ InspectorTest.expectThat(Object.shallowEqual(obj2, obj1), "shallowEqual of equal objects should be true.");
+
+ let obj3 = {a: 1, b: 2, c: 3};
+ InspectorTest.expectThat(!Object.shallowEqual(obj1, obj3), "shallowEqual of inequal objects should be false.");
+ InspectorTest.expectThat(!Object.shallowEqual(obj3, obj1), "shallowEqual of inequal objects should be false.");
+
+ InspectorTest.expectThat(!Object.shallowEqual({}, null), "shallowEqual of an object and null should be false.");
+ InspectorTest.expectThat(!Object.shallowEqual({}, 1.23), "shallowEqual of an object and non-object should be false.");
+
+ let str = "abc";
+ InspectorTest.expectThat(!Object.shallowEqual(str, str), "shallowEqual of a non-object with itself should be false.");
+ InspectorTest.expectThat(!Object.shallowEqual("abc", "abc"), "shallowEqual of non-objects should be false.");
+
+ class A {};
+ class B {};
+ class C extends A {};
+
+ InspectorTest.expectThat(Object.shallowEqual(new A, new A), "shallowEqual of objects with equal constructors should be true.");
+ InspectorTest.expectThat(!Object.shallowEqual(new A, new B), "shallowEqual of objects with different constructors should be false.");
+ InspectorTest.expectThat(!Object.shallowEqual(new A, new C), "shallowEqual of objects with different constructors should be false.");
+
+ return true;
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onLoad="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205814 => 205815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-12 18:18:05 UTC (rev 205814)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-12 18:35:40 UTC (rev 205815)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-12 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Object.shallowEqual() should return false if object prototype chains differ
+ https://bugs.webkit.org/show_bug.cgi?id=161852
+
+ Reviewed by Joseph Pecoraro.
+
+ Improve Object.shallowEqual so it won't produce false positives.
+
+ * UserInterface/Base/Utilities.js:
+ (value):
+ Object.shallowEqual should return false for non-array arguments.
+ Since typeof null === "object", use `instanceof` instead to avoid separate
+ null checks. Also use Array.shallowEqual fast path when both arguments are arrays.
+
</ins><span class="cx"> 2016-09-11 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Combine similar SVG files for Styles sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (205814 => 205815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-09-12 18:18:05 UTC (rev 205814)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2016-09-12 18:35:40 UTC (rev 205815)
</span><span class="lines">@@ -47,12 +47,19 @@
</span><span class="cx"> {
</span><span class="cx"> // Checks if two objects have the same top-level properties.
</span><span class="cx">
</span><ins>+ // Only objects can proceed.
+ if (!(a instanceof Object) || !(b instanceof Object))
+ return false;
+
</ins><span class="cx"> // Check for strict equality in case they are the same object.
</span><span class="cx"> if (a === b)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- // Only objects can proceed. null is an object, but Object.keys throws for null.
- if (typeof a !== "object" || typeof b !== "object" || a === null || b === null)
</del><ins>+ // Use an optimized version of shallowEqual for arrays.
+ if ((a instanceof Array) && (b instanceof Array))
+ return Array.shallowEqual(a, b);
+
+ if (a.constructor !== b.constructor)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> var aKeys = Object.keys(a);
</span></span></pre>
</div>
</div>
</body>
</html>