<!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>[192608] 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/192608">192608</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-11-18 20:14:24 -0800 (Wed, 18 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assertion failure in RenderTreePosition::computeNextSibling
https://bugs.webkit.org/show_bug.cgi?id=151337
rdar://problem/23250075
Reviewed by Zalan Bujtas.
Source/WebCore:
Test: fast/html/details-mathml-crash.html
* html/ads: Added.
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveChildAtShadowBoundary):
Factor common code for resolving child here from resolveShadowTree.
(WebCore::Style::resolveShadowTree):
We don't need StyleResolverParentPusher because shadow tree uses different style resolver anyway.
(WebCore::Style::resolveSlotAssignees):
This needs to call renderTreePosition.invalidateNextSibling() if there is a renderer already.
Achieve this by calling the new common function resolveChildAtShadowBoundary.
LayoutTests:
Test case by Pranjal Jumde.
* fast/html/details-mathml-crash-expected.txt: Added.
* fast/html/details-mathml-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="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthtmldetailsmathmlcrashexpectedtxt">trunk/LayoutTests/fast/html/details-mathml-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasthtmldetailsmathmlcrashhtml">trunk/LayoutTests/fast/html/details-mathml-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192607 => 192608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-19 03:20:11 UTC (rev 192607)
+++ trunk/LayoutTests/ChangeLog 2015-11-19 04:14:24 UTC (rev 192608)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-18 Antti Koivisto <antti@apple.com>
+
+ Assertion failure in RenderTreePosition::computeNextSibling
+ https://bugs.webkit.org/show_bug.cgi?id=151337
+ rdar://problem/23250075
+
+ Reviewed by Zalan Bujtas.
+
+ Test case by Pranjal Jumde.
+
+ * fast/html/details-mathml-crash-expected.txt: Added.
+ * fast/html/details-mathml-crash.html: Added.
+
</ins><span class="cx"> 2015-11-18 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK1] Crash loading Blink layout test fast/dom/Window/property-access-on-cached-window-after-frame-removed.html
</span></span></pre></div>
<a id="trunkLayoutTestsfasthtmldetailsmathmlcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/details-mathml-crash-expected.txt (0 => 192608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/details-mathml-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/html/details-mathml-crash-expected.txt 2015-11-19 04:14:24 UTC (rev 192608)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test passes if it doesn't crash.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthtmldetailsmathmlcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/html/details-mathml-crash.html (0 => 192608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/html/details-mathml-crash.html (rev 0)
+++ trunk/LayoutTests/fast/html/details-mathml-crash.html 2015-11-19 04:14:24 UTC (rev 192608)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This test passes if it doesn't crash.
+<div><br><summary><mrow></mrow><br>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.execCommand("SelectAll", false, null);
+var style = document.createElement("style");
+style.innerHTML="* { position: absolute; }";
+document.getElementsByTagName("head")[0].appendChild(style);
+</script>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192607 => 192608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-19 03:20:11 UTC (rev 192607)
+++ trunk/Source/WebCore/ChangeLog 2015-11-19 04:14:24 UTC (rev 192608)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-11-18 Antti Koivisto <antti@apple.com>
+
+ Assertion failure in RenderTreePosition::computeNextSibling
+ https://bugs.webkit.org/show_bug.cgi?id=151337
+ rdar://problem/23250075
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/html/details-mathml-crash.html
+
+ * html/ads: Added.
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveChildAtShadowBoundary):
+
+ Factor common code for resolving child here from resolveShadowTree.
+
+ (WebCore::Style::resolveShadowTree):
+
+ We don't need StyleResolverParentPusher because shadow tree uses different style resolver anyway.
+
+ (WebCore::Style::resolveSlotAssignees):
+
+ This needs to call renderTreePosition.invalidateNextSibling() if there is a renderer already.
+ Achieve this by calling the new common function resolveChildAtShadowBoundary.
+
</ins><span class="cx"> 2015-11-18 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL slow video to texture
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (192607 => 192608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-11-19 03:20:11 UTC (rev 192607)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-11-19 04:14:24 UTC (rev 192608)
</span><span class="lines">@@ -677,27 +677,29 @@
</span><span class="cx"> invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(text);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void resolveShadowTree(ShadowRoot& shadowRoot, Element& host, Style::Change change)
</del><ins>+static void resolveChildAtShadowBoundary(Node& child, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Style::Change change)
</ins><span class="cx"> {
</span><del>- StyleResolverParentPusher parentPusher(&host);
</del><ins>+ if (auto* renderer = child.renderer())
+ renderTreePosition.invalidateNextSibling(*renderer);
</ins><span class="cx">
</span><ins>+ if (is<Text>(child) && child.needsStyleRecalc()) {
+ resolveTextNode(downcast<Text>(child), renderTreePosition);
+ return;
+ }
+ if (is<Element>(child))
+ resolveTree(downcast<Element>(child), inheritedStyle, renderTreePosition, change);
+}
+
+static void resolveShadowTree(ShadowRoot& shadowRoot, Element& host, Style::Change change)
+{
</ins><span class="cx"> ASSERT(shadowRoot.host() == &host);
</span><span class="cx"> ASSERT(host.renderer());
</span><ins>+ auto& inheritedStyle = host.renderer()->style();
</ins><span class="cx"> if (shadowRoot.styleChangeType() >= FullStyleChange)
</span><span class="cx"> change = Force;
</span><span class="cx"> RenderTreePosition renderTreePosition(*host.renderer());
</span><del>- for (Node* child = shadowRoot.firstChild(); child; child = child->nextSibling()) {
- if (child->renderer())
- renderTreePosition.invalidateNextSibling(*child->renderer());
- if (is<Text>(*child) && child->needsStyleRecalc()) {
- resolveTextNode(downcast<Text>(*child), renderTreePosition);
- continue;
- }
- if (is<Element>(*child)) {
- parentPusher.push();
- resolveTree(downcast<Element>(*child), host.renderer()->style(), renderTreePosition, change);
- }
- }
</del><ins>+ for (auto* child = shadowRoot.firstChild(); child; child = child->nextSibling())
+ resolveChildAtShadowBoundary(*child, inheritedStyle, renderTreePosition, change);
</ins><span class="cx">
</span><span class="cx"> shadowRoot.clearNeedsStyleRecalc();
</span><span class="cx"> shadowRoot.clearChildNeedsStyleRecalc();
</span><span class="lines">@@ -804,20 +806,11 @@
</span><span class="cx"> static void resolveSlotAssignees(HTMLSlotElement& slot, RenderStyle& inheritedStyle, RenderTreePosition& renderTreePosition, Change change)
</span><span class="cx"> {
</span><span class="cx"> if (auto* assignedNodes = slot.assignedNodes()) {
</span><del>- for (auto* child : *assignedNodes) {
- if (is<Text>(*child))
- resolveTextNode(downcast<Text>(*child), renderTreePosition);
- else if (is<Element>(*child))
- resolveTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, change);
- }
- } else {
- for (Node* child = slot.firstChild(); child; child = child->nextSibling()) {
- if (is<Text>(*child))
- resolveTextNode(downcast<Text>(*child), renderTreePosition);
- else if (is<Element>(*child))
- resolveTree(downcast<Element>(*child), inheritedStyle, renderTreePosition, change);
- }
- }
</del><ins>+ for (auto* child : *assignedNodes)
+ resolveChildAtShadowBoundary(*child, inheritedStyle, renderTreePosition, change);
+ } else
+ resolveChildren(slot, inheritedStyle, change, renderTreePosition);
+
</ins><span class="cx"> slot.clearNeedsStyleRecalc();
</span><span class="cx"> slot.clearChildNeedsStyleRecalc();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>