<!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>[210386] branches/safari-603-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/210386">210386</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 15:49:26 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210284">r210284</a>. rdar://problem/29865854</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomElementcpp">branches/safari-603-branch/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLImageElementcpp">branches/safari-603-branch/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLObjectElementcpp">branches/safari-603-branch/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomdocumentnamedpropertyexpectedtxt">branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomdocumentnamedpropertyhtml">branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomwindownamedpropertyexpectedtxt">branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastshadowdomwindownamedpropertyhtml">branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210385 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 23:49:22 UTC (rev 210385)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210284. rdar://problem/29865854
+
+ 2017-01-04 Chris Dumez <cdumez@apple.com>
+
+ Assertion hit on redfin.com: ASSERTION FAILED: collection->length() > 1
+ https://bugs.webkit.org/show_bug.cgi?id=166687
+ <rdar://problem/29865854>
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage.
+
+ * fast/shadow-dom/document-named-property-expected.txt: Added.
+ * fast/shadow-dom/document-named-property.html: Added.
+ * fast/shadow-dom/window-named-property-expected.txt: Added.
+ * fast/shadow-dom/window-named-property.html: Added.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210279. rdar://problem/29607569
</span><span class="cx">
</span><span class="cx"> 2017-01-04 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomdocumentnamedpropertyexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property-expected.txt (0 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property-expected.txt 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+
+
+
+
+
+PASS Document's named property getter should not return elements in shadow DOMs by id
+PASS Document's named property getter should not return elements in shadow DOMs by id (duplicate id)
+PASS Document's named property getter should not return elements in shadow DOMs by id (id attribute update)
+PASS Document's named property getter should not return elements in shadow DOMs by id (duplicate id attribute update)
+PASS Document's named property getter should not return elements in shadow DOMs by id (image name change)
+PASS Document's named property getter should not return elements in shadow DOMs by id (image name change with duplicate id)
+PASS Document's named property getter should not return elements in shadow DOMs by id (object children change)
+PASS Document's named property getter should not return elements in shadow DOMs by id (object children change with duplicate id)
+PASS Document's named property getter should not return elements in shadow DOMs by name
+PASS Document's named property getter should not return elements in shadow DOMs by name (duplicate name)
+PASS Document's named property getter should not return elements in shadow DOMs by name (name attribute update)
+PASS Document's named property getter should not return elements in shadow DOMs by name (duplicate name attribute update)
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomdocumentnamedpropertyhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property.html (0 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/document-named-property.html 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -0,0 +1,187 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src='../../resources/testharness.js'></script>
+<script src='../../resources/testharnessreport.js'></script>
+<div id="container"></div>
+<script>
+var container = document.getElementById('container');
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img id="foo" name="test2"></img>';
+ container.appendChild(header);
+
+ assert_equals(document.foo, undefined);
+}, "Document's named property getter should not return elements in shadow DOMs by id");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img id="foo1" name="test2"></img>';
+ container.appendChild(header);
+
+ var img = document.createElement("img");
+ img.id = 'foo1';
+ img.name = 'test1'
+ container.appendChild(img);
+
+ assert_equals(document.foo1, img);
+ assert_equals(shadowRoot.firstChild.id, 'foo1');
+ shadowRoot.removeChild(shadowRoot.firstChild);
+ assert_equals(document.foo1, img);
+}, "Document's named property getter should not return elements in shadow DOMs by id (duplicate id)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img name="test2"></img>';
+ container.appendChild(header);
+
+ assert_equals(document.foo2, undefined);
+ shadowRoot.firstChild.id = 'foo2';
+ assert_equals(document.foo2, undefined);
+
+}, "Document's named property getter should not return elements in shadow DOMs by id (id attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img name="test2"></img>';
+ container.appendChild(header);
+
+ var img = document.createElement("img");
+ img.id = 'foo3';
+ img.setAttribute('name', 'test1');
+ container.appendChild(img);
+
+ assert_equals(document.foo3, img);
+ shadowRoot.firstChild.id = 'foo3';
+ assert_equals(document.foo3, img);
+
+ shadowRoot.firstChild.id = 'other';
+ assert_equals(document.foo3, img);
+}, "Document's named property getter should not return elements in shadow DOMs by id (duplicate id attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img></img>';
+ container.appendChild(header);
+
+ assert_equals(document.foo4, undefined);
+ shadowRoot.firstChild.id = 'foo4';
+ assert_equals(document.foo4, undefined);
+ shadowRoot.firstChild.setAttribute('name', 'test3');
+ assert_equals(document.foo4, undefined);
+
+}, "Document's named property getter should not return elements in shadow DOMs by id (image name change)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img></img>';
+ container.appendChild(header);
+
+ var img = document.createElement("img");
+ img.id = 'foo5';
+ img.setAttribute('name', 'test1');
+ container.appendChild(img);
+
+ assert_equals(document.foo5, img);
+ shadowRoot.firstChild.id = 'foo5';
+ assert_equals(document.foo5, img);
+ shadowRoot.firstChild.setAttribute('name', 'test3');
+ assert_equals(document.foo5, img);
+
+ shadowRoot.firstChild.removeAttribute('name');
+ assert_equals(document.foo5, img);
+}, "Document's named property getter should not return elements in shadow DOMs by id (image name change with duplicate id)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<object id="foo6">text</object>';
+ container.appendChild(header);
+
+ assert_equals(document.foo6, undefined);
+ assert_equals(shadowRoot.firstChild.firstChild.data, "text");
+ shadowRoot.firstChild.removeChild(shadowRoot.firstChild.firstChild);
+ assert_equals(document.foo6, undefined);
+}, "Document's named property getter should not return elements in shadow DOMs by id (object children change)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<object id="foo7">text</object>';
+ container.appendChild(header);
+
+ var object = document.createElement("object");
+ object.id = 'foo7';
+ container.appendChild(object);
+
+ assert_equals(document.foo7, object);
+ assert_equals(shadowRoot.firstChild.firstChild.data, "text");
+ shadowRoot.firstChild.removeChild(shadowRoot.firstChild.firstChild);
+ assert_equals(document.foo7, object);
+ shadowRoot.firstChild.appendChild(document.createElement("a"));
+ assert_equals(document.foo7, object);
+}, "Document's named property getter should not return elements in shadow DOMs by id (object children change with duplicate id)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img name="bar"></img>';
+ document.body.appendChild(header);
+
+ assert_equals(document.bar, undefined);
+}, "Document's named property getter should not return elements in shadow DOMs by name");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img name="bar1"></img>';
+ document.body.appendChild(header);
+
+ var img = document.createElement("img");
+ img.setAttribute('name', 'bar1');
+ container.appendChild(img);
+
+ assert_equals(document.bar1, img);
+ assert_equals(shadowRoot.firstChild.getAttribute('name'), 'bar1');
+ shadowRoot.removeChild(shadowRoot.firstChild);
+ assert_equals(document.bar1, img);
+}, "Document's named property getter should not return elements in shadow DOMs by name (duplicate name)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img></img>';
+ document.body.appendChild(header);
+
+ assert_equals(document.bar2, undefined);
+ shadowRoot.firstChild.setAttribute('name', 'bar2');
+ assert_equals(document.bar2, undefined);
+}, "Document's named property getter should not return elements in shadow DOMs by name (name attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<img></img>';
+ document.body.appendChild(header);
+
+ var img = document.createElement("img");
+ img.setAttribute('name', 'bar3');
+ container.appendChild(img);
+
+ assert_equals(document.bar3, img);
+ shadowRoot.firstChild.setAttribute('name', 'bar3');
+ assert_equals(document.bar3, img);
+
+ shadowRoot.firstChild.setAttribute('name', 'other');
+ assert_equals(document.bar3, img);
+}, "Document's named property getter should not return elements in shadow DOMs by name (duplicate name attribute update)");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomwindownamedpropertyexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property-expected.txt (0 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property-expected.txt 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+
+PASS Window's named property getter should not return elements in shadow DOMs by id
+PASS Window's named property getter should not return elements in shadow DOMs by id (duplicate id)
+PASS Window's named property getter should not return elements in shadow DOMs by id (id attribute update)
+PASS Window's named property getter should not return elements in shadow DOMs by id (duplicate id attribute update)
+PASS Window's named property getter should not return elements in shadow DOMs by name
+PASS Window's named property getter should not return elements in shadow DOMs by name (duplicate name)
+PASS Window's named property getter should not return elements in shadow DOMs by name (name attribute update)
+PASS Window's named property getter should not return elements in shadow DOMs by name (duplicate name attribute update)
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastshadowdomwindownamedpropertyhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property.html (0 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/shadow-dom/window-named-property.html 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -0,0 +1,119 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src='../../resources/testharness.js'></script>
+<script src='../../resources/testharnessreport.js'></script>
+<div id="container"></div>
+<script>
+var container = document.getElementById('container');
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<span id="foo"></span>';
+ container.appendChild(header);
+
+ assert_equals(window.foo, undefined);
+}, "Window's named property getter should not return elements in shadow DOMs by id");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<span id="foo1"></span>';
+ container.appendChild(header);
+
+ var span = document.createElement("span");
+ span.id = 'foo1';
+ container.appendChild(span);
+
+ assert_equals(window.foo1, span);
+ assert_equals(shadowRoot.firstChild.id, 'foo1');
+ shadowRoot.removeChild(shadowRoot.firstChild);
+ assert_equals(window.foo1, span);
+}, "Window's named property getter should not return elements in shadow DOMs by id (duplicate id)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<span></span>';
+ container.appendChild(header);
+
+ assert_equals(window.foo2, undefined);
+ shadowRoot.firstChild.id = 'foo2';
+ assert_equals(window.foo2, undefined);
+}, "Window's named property getter should not return elements in shadow DOMs by id (id attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<span></span>';
+ container.appendChild(header);
+
+ var span = document.createElement("span");
+ span.id = 'foo3';
+ container.appendChild(span);
+
+ assert_equals(window.foo3, span);
+ shadowRoot.firstChild.id = 'foo3';
+ assert_equals(window.foo3, span);
+
+ shadowRoot.firstChild.id = 'other';
+ assert_equals(window.foo3, span);
+}, "Window's named property getter should not return elements in shadow DOMs by id (duplicate id attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<form name="bar"></form>';
+ document.body.appendChild(header);
+
+ assert_equals(window.bar, undefined);
+}, "Window's named property getter should not return elements in shadow DOMs by name");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<form name="bar1"></form>';
+ document.body.appendChild(header);
+
+ var form = document.createElement("form");
+ form.setAttribute('name', 'bar1');
+ container.appendChild(form);
+
+ assert_equals(window.bar1, form);
+ assert_equals(shadowRoot.firstChild.getAttribute('name'), 'bar1');
+ shadowRoot.removeChild(shadowRoot.firstChild);
+ assert_equals(window.bar1, form);
+}, "Window's named property getter should not return elements in shadow DOMs by name (duplicate name)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<form></form>';
+ document.body.appendChild(header);
+
+ assert_equals(window.bar2, undefined);
+ shadowRoot.firstChild.setAttribute('name', 'bar2');
+ assert_equals(window.bar2, undefined);
+}, "Window's named property getter should not return elements in shadow DOMs by name (name attribute update)");
+
+test(function () {
+ var header = document.createElement('header');
+ var shadowRoot = header.attachShadow({mode: 'open'});
+ shadowRoot.innerHTML = '<form></form>';
+ document.body.appendChild(header);
+
+ var form = document.createElement("form");
+ form.setAttribute('name', 'bar3');
+ container.appendChild(form);
+
+ assert_equals(window.bar3, form);
+ shadowRoot.firstChild.setAttribute('name', 'bar3');
+ assert_equals(window.bar3, form);
+
+ shadowRoot.firstChild.setAttribute('name', 'other');
+ assert_equals(window.bar3, form);
+}, "Window's named property getter should not return elements in shadow DOMs by name (duplicate name attribute update)");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210385 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:22 UTC (rev 210385)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210284. rdar://problem/29865854
+
+ 2017-01-04 Chris Dumez <cdumez@apple.com>
+
+ Assertion hit on redfin.com: ASSERTION FAILED: collection->length() > 1
+ https://bugs.webkit.org/show_bug.cgi?id=166687
+ <rdar://problem/29865854>
+
+ Reviewed by Darin Adler.
+
+ We were mistakenly calling Document::addWindowNamedItem() / Document::removeWindowNamedItem()
+ for elements in Shadow DOMs. As a result, the windowNamedItem DocumentOrderedMap would
+ contain elements in shadow DOMs. This would cause the assertion to be hit in window's
+ named property getter because of the length mismatch between the windowNamedItem
+ DocumentOrderedMap and the WindowNameCollection.
+
+ Tests: fast/shadow-dom/document-named-property.html
+ fast/shadow-dom/window-named-property.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::updateNameForDocument):
+ (WebCore::Element::updateIdForDocument):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::parseAttribute):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::updateDocNamedItem):
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210279. rdar://problem/29607569
</span><span class="cx">
</span><span class="cx"> 2017-01-04 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Element.cpp (210385 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Element.cpp 2017-01-05 23:49:22 UTC (rev 210385)
+++ branches/safari-603-branch/Source/WebCore/dom/Element.cpp 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -3236,6 +3236,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(oldName != newName);
</span><span class="cx">
</span><ins>+ if (isInShadowTree())
+ return;
+
</ins><span class="cx"> if (WindowNameCollection::elementMatchesIfNameAttributeMatch(*this)) {
</span><span class="cx"> const AtomicString& id = WindowNameCollection::elementMatchesIfIdAttributeMatch(*this) ? getIdAttribute() : nullAtom;
</span><span class="cx"> if (!oldName.isEmpty() && oldName != id)
</span><span class="lines">@@ -3286,6 +3289,9 @@
</span><span class="cx"> ASSERT(inDocument());
</span><span class="cx"> ASSERT(oldId != newId);
</span><span class="cx">
</span><ins>+ if (isInShadowTree())
+ return;
+
</ins><span class="cx"> if (WindowNameCollection::elementMatchesIfIdAttributeMatch(*this)) {
</span><span class="cx"> const AtomicString& name = condition == UpdateHTMLDocumentNamedItemMapsOnlyIfDiffersFromNameAttribute && WindowNameCollection::elementMatchesIfNameAttributeMatch(*this) ? getNameAttribute() : nullAtom;
</span><span class="cx"> if (!oldId.isEmpty() && oldId != name)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLImageElement.cpp (210385 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLImageElement.cpp 2017-01-05 23:49:22 UTC (rev 210385)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLImageElement.cpp 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (name == nameAttr) {
</span><span class="cx"> bool willHaveName = !value.isNull();
</span><del>- if (m_hadNameBeforeAttributeChanged != willHaveName && inDocument() && is<HTMLDocument>(document())) {
</del><ins>+ if (m_hadNameBeforeAttributeChanged != willHaveName && inDocument() && !isInShadowTree() && is<HTMLDocument>(document())) {
</ins><span class="cx"> HTMLDocument& document = downcast<HTMLDocument>(this->document());
</span><span class="cx"> const AtomicString& id = getIdAttribute();
</span><span class="cx"> if (!id.isEmpty() && id != getNameAttribute()) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLObjectElement.cpp (210385 => 210386)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLObjectElement.cpp 2017-01-05 23:49:22 UTC (rev 210385)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLObjectElement.cpp 2017-01-05 23:49:26 UTC (rev 210386)
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> isNamedItem = false;
</span><span class="cx"> child = child->nextSibling();
</span><span class="cx"> }
</span><del>- if (isNamedItem != wasNamedItem && inDocument() && is<HTMLDocument>(document())) {
</del><ins>+ if (isNamedItem != wasNamedItem && inDocument() && !isInShadowTree() && is<HTMLDocument>(document())) {
</ins><span class="cx"> HTMLDocument& document = downcast<HTMLDocument>(this->document());
</span><span class="cx">
</span><span class="cx"> const AtomicString& id = getIdAttribute();
</span></span></pre>
</div>
</div>
</body>
</html>