<!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>[201393] 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/201393">201393</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 12:04:47 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore:
Shadow DOM: RenderTreePosition miscomputed when display:contents value changes
https://bugs.webkit.org/show_bug.cgi?id=158072
rdar://problem/25766333
Reviewed by Darin Adler.
Test: fast/shadow-dom/slot-crash.html
* style/RenderTreePosition.h:
(WebCore::RenderTreePosition::invalidateNextSibling):
Add unconditional invalidation function.
* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::updateElementRenderer):
With display:contents rendering siblings may be found from the subtree and the existing cached
position may become invalid.
If the display:contents value changes invalidate the current render tree position.
LayoutTests:
Shadow DOM: RenderTreePosition should determine if element has display:contents from new style
https://bugs.webkit.org/show_bug.cgi?id=158072
Reviewed by Darin Adler.
* fast/shadow-dom/slot-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreePositionh">trunk/Source/WebCore/style/RenderTreePosition.h</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomslotcrashexpectedtxt">trunk/LayoutTests/fast/shadow-dom/slot-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomslotcrashhtml">trunk/LayoutTests/fast/shadow-dom/slot-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201392 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-25 18:59:40 UTC (rev 201392)
+++ trunk/LayoutTests/ChangeLog 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-05-25 Antti Koivisto <antti@apple.com>
+
+ Shadow DOM: RenderTreePosition should determine if element has display:contents from new style
+ https://bugs.webkit.org/show_bug.cgi?id=158072
+
+ Reviewed by Darin Adler.
+
+ * fast/shadow-dom/slot-crash.html: Added.
+
</ins><span class="cx"> 2016-05-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update dom/Window/messageevent-source-postmessage-reified.html after r201315
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-crash-expected.txt (0 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-crash-expected.txt 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it doesn't crash/assert.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomslotcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/slot-crash.html (0 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/slot-crash.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/slot-crash.html 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<html id="webtest0">
+<head></head>
+<body>
+This test passes if it doesn't crash/assert.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+for (wf_i=0;wf_i<30;wf_i++) {
+var scroll_35 = document.createElement("iframe");
+document.getElementById("webtest0").appendChild(document.createElement("slot")).appendChild(scroll_35);
+}
+
+document.body.offsetLeft;
+
+head = document.getElementsByTagName("head")[0];
+style = document.createElement("style");
+style.type = "text/css";
+style.innerHTML="* { position: absolute; }";
+head.appendChild(style);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201392 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 18:59:40 UTC (rev 201392)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-25 Antti Koivisto <antti@apple.com>
+
+ Shadow DOM: RenderTreePosition miscomputed when display:contents value changes
+ https://bugs.webkit.org/show_bug.cgi?id=158072
+ rdar://problem/25766333
+
+ Reviewed by Darin Adler.
+
+ Test: fast/shadow-dom/slot-crash.html
+
+ * style/RenderTreePosition.h:
+ (WebCore::RenderTreePosition::invalidateNextSibling):
+
+ Add unconditional invalidation function.
+
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+ With display:contents rendering siblings may be found from the subtree and the existing cached
+ position may become invalid.
+ If the display:contents value changes invalidate the current render tree position.
+
</ins><span class="cx"> 2016-05-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: IDB objects from a worker thread might be destroyed on the main thread.
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreePositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreePosition.h (201392 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreePosition.h 2016-05-25 18:59:40 UTC (rev 201392)
+++ trunk/Source/WebCore/style/RenderTreePosition.h 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> bool canInsert(RenderText&) const;
</span><span class="cx">
</span><span class="cx"> void computeNextSibling(const Node&);
</span><ins>+ void invalidateNextSibling() { m_hasValidNextSibling = false; }
</ins><span class="cx"> void invalidateNextSibling(const RenderObject&);
</span><span class="cx">
</span><span class="cx"> RenderObject* previousSiblingRenderer(const Text&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (201392 => 201393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-05-25 18:59:40 UTC (rev 201392)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-05-25 19:04:47 UTC (rev 201393)
</span><span class="lines">@@ -245,7 +245,11 @@
</span><span class="cx"> tearDownRenderers(element, TeardownType::KeepHoverAndActive);
</span><span class="cx">
</span><span class="cx"> bool hasDisplayContest = update.style && update.style->display() == CONTENTS;
</span><del>- element.setHasDisplayContents(hasDisplayContest);
</del><ins>+ if (hasDisplayContest != element.hasDisplayContents()) {
+ element.setHasDisplayContents(hasDisplayContest);
+ // Render tree position needs to be recomputed as rendering siblings may be found from the display:contents subtree.
+ renderTreePosition().invalidateNextSibling();
+ }
</ins><span class="cx">
</span><span class="cx"> bool shouldCreateNewRenderer = !element.renderer() && update.style && !hasDisplayContest;
</span><span class="cx"> if (shouldCreateNewRenderer) {
</span></span></pre>
</div>
</div>
</body>
</html>