<!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>[199363] releases/WebKitGTK/webkit-2.12</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/199363">199363</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 09:32:57 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198090">r198090</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/190840">r190840</a>): crash inside details element's slotNameFunction
https://bugs.webkit.org/show_bug.cgi?id=155388
Reviewed by Antti Koivisto.
Source/WebCore:
The bug was caused by HTMLDetailsElement::isActiveSummary calling findAssignedSlot with a summary element
inside the shadow tree of the detials element. Fixed it by existing early when the summary element passed
to isActiveSummary is not a direct child of the details element.
Test: fast/html/details-summary-tabindex-crash.html
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::findAssignedSlot): Added an assertion for regression testing.
* dom/SlotAssignment.cpp:
(WebCore::SlotAssignment::findAssignedSlot): Removed the superfluous call to assignSlots added in <a href="http://trac.webkit.org/projects/webkit/changeset/190840">r190840</a>.
There is no need to update the slot assignments here (entires in m_slots are added or removed by
addSlotElementByName or removeSlotElementByName and assignSlots only updates assignedNodes in each SlotInfo
which is never used in this function or findFirstSlotElement.
* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::isActiveSummary): Fixed the bug.
LayoutTests:
Added a regression test.
* fast/html/details-summary-tabindex-crash-expected.txt: Added.
* fast/html/details-summary-tabindex-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomShadowRootcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomSlotAssignmentcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/SlotAssignment.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorehtmlHTMLDetailsElementcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLDetailsElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfasthtmldetailssummarytabindexcrashexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfasthtmldetailssummarytabindexcrashhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199362 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:30:50 UTC (rev 199362)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r190840): crash inside details element's slotNameFunction
+ https://bugs.webkit.org/show_bug.cgi?id=155388
+
+ Reviewed by Antti Koivisto.
+
+ Added a regression test.
+
+ * fast/html/details-summary-tabindex-crash-expected.txt: Added.
+ * fast/html/details-summary-tabindex-crash.html: Added.
+
</ins><span class="cx"> 2016-03-13 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator fails to traverse slots if root is shadow host
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfasthtmldetailssummarytabindexcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash-expected.txt (0 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash-expected.txt 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests calling tabIndex on the summary element inside a details element. WebKit should not hit any assertions.
+
+summary content
+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfasthtmldetailssummarytabindexcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash.html (0 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/html/details-summary-tabindex-crash.html 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests calling tabIndex on the summary element inside a details element. WebKit should not hit any assertions.</p>
+<details tabindex=0>
+<summary>summary content</summary>
+summary details
+</details>
+<script>
+
+if (window.internals) {
+ testRunner.dumpAsText();
+
+ var detailsShadow = internals.shadowRoot(document.querySelector('details'));
+ detailsShadow.querySelector('summary').tabIndex;
+
+ document.write('PASS');
+} else
+ document.write('FAIL - This test requires window.internals');
+
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199362 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:30:50 UTC (rev 199362)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r190840): crash inside details element's slotNameFunction
+ https://bugs.webkit.org/show_bug.cgi?id=155388
+
+ Reviewed by Antti Koivisto.
+
+ The bug was caused by HTMLDetailsElement::isActiveSummary calling findAssignedSlot with a summary element
+ inside the shadow tree of the detials element. Fixed it by existing early when the summary element passed
+ to isActiveSummary is not a direct child of the details element.
+
+ Test: fast/html/details-summary-tabindex-crash.html
+
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::findAssignedSlot): Added an assertion for regression testing.
+ * dom/SlotAssignment.cpp:
+ (WebCore::SlotAssignment::findAssignedSlot): Removed the superfluous call to assignSlots added in r190840.
+ There is no need to update the slot assignments here (entires in m_slots are added or removed by
+ addSlotElementByName or removeSlotElementByName and assignSlots only updates assignedNodes in each SlotInfo
+ which is never used in this function or findFirstSlotElement.
+ * html/HTMLDetailsElement.cpp:
+ (WebCore::HTMLDetailsElement::isActiveSummary): Fixed the bug.
+
</ins><span class="cx"> 2016-03-13 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> ComposedTreeIterator fails to traverse slots if root is shadow host
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ShadowRoot.cpp (199362 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ShadowRoot.cpp 2016-04-12 16:30:50 UTC (rev 199362)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/ShadowRoot.cpp 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx">
</span><span class="cx"> HTMLSlotElement* ShadowRoot::findAssignedSlot(const Node& node)
</span><span class="cx"> {
</span><ins>+ ASSERT(node.parentNode() == host());
</ins><span class="cx"> if (!m_slotAssignment)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return m_slotAssignment->findAssignedSlot(node, *this);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomSlotAssignmentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/SlotAssignment.cpp (199362 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/SlotAssignment.cpp 2016-04-12 16:30:50 UTC (rev 199362)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/SlotAssignment.cpp 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -64,9 +64,6 @@
</span><span class="cx"> if (!is<Text>(node) && !is<Element>(node))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (!m_slotAssignmentsIsValid)
- assignSlots(shadowRoot);
-
</del><span class="cx"> auto slotName = m_slotNameFunction(node);
</span><span class="cx"> if (!slotName)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorehtmlHTMLDetailsElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLDetailsElement.cpp (199362 => 199363)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLDetailsElement.cpp 2016-04-12 16:30:50 UTC (rev 199362)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLDetailsElement.cpp 2016-04-12 16:32:57 UTC (rev 199363)
</span><span class="lines">@@ -103,6 +103,9 @@
</span><span class="cx"> if (!m_summarySlot->assignedNodes())
</span><span class="cx"> return &summary == m_defaultSummary;
</span><span class="cx">
</span><ins>+ if (summary.parentNode() != this)
+ return false;
+
</ins><span class="cx"> auto* slot = shadowRoot()->findAssignedSlot(summary);
</span><span class="cx"> if (!slot)
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>