<!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>[214515] 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/214515">214515</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 20:28:05 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211645">r211645</a>. rdar://problem/30922105</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="#branchessafari603branchSourceWebCorehtmlparserHTMLTreeBuildercpp">branches/safari-603-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastparserfragmentwithframesetcrashexpectedtxt">branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastparserfragmentwithframesetcrashhtml">branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash.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 (214514 => 214515)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 01:56:16 UTC (rev 214514)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-29 03:28:05 UTC (rev 214515)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-28 Jason Marcell <jmarcell@apple.com>
+
+ Merge r211645. rdar://problem/30922105
+
+ 2017-02-03 Chris Dumez <cdumez@apple.com>
+
+ Fix bad assertion under HTMLTreeBuilder::processStartTagForInBody()
+ https://bugs.webkit.org/show_bug.cgi?id=167799
+ <rdar://problem/30237241>
+
+ Reviewed by Brent Fulgham.
+
+ Add layout test coverage. This test passes in all major browsers but used to hit
+ the bad assertion in WebKit debug builds.
+
+ * fast/parser/fragment-with-frameset-crash-expected.txt: Added.
+ * fast/parser/fragment-with-frameset-crash.html: Added.
+
</ins><span class="cx"> 2017-03-20 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r214096.
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastparserfragmentwithframesetcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash-expected.txt (0 => 214515)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash-expected.txt 2017-03-29 03:28:05 UTC (rev 214515)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test that we do not crash when parsing a fragment that contains a frameset.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS frames[0].document.documentElement.innerHTML is "<head></head><frameset cols=\"50%,50%\"><frame src=\"about:blank\"><frame src=\"about:blank\"></frameset>"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastparserfragmentwithframesetcrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash.html (0 => 214515)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/parser/fragment-with-frameset-crash.html 2017-03-29 03:28:05 UTC (rev 214515)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<iframe srcdoc='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"><html></html>'></iframe>
+<script>
+description("Test that we do not crash when parsing a fragment that contains a frameset.");
+jsTestIsAsync = true;
+
+onload = function() {
+ frames[0].document.documentElement.innerHTML = "<caption><frameset cols='50%,50%'><frame src='about:blank'/><frame src='about:blank'></frameset>";
+ shouldBeEqualToString("frames[0].document.documentElement.innerHTML", '<head></head><frameset cols="50%,50%"><frame src="about:blank"><frame src="about:blank"></frameset>');
+ finishJSTest();
+}
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214514 => 214515)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 01:56:16 UTC (rev 214514)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-29 03:28:05 UTC (rev 214515)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2017-03-28 Jason Marcell <jmarcell@apple.com>
+
+ Merge r211645. rdar://problem/30922105
+
+ 2017-02-03 Chris Dumez <cdumez@apple.com>
+
+ Fix bad assertion under HTMLTreeBuilder::processStartTagForInBody()
+ https://bugs.webkit.org/show_bug.cgi?id=167799
+ <rdar://problem/30237241>
+
+ Reviewed by Brent Fulgham.
+
+ Fix bad assertion under HTMLTreeBuilder::processStartTagForInBody() that was
+ expecting the root element to be an <html> element when parsing a <frameset>.
+ While this assertion is true in theory and as per the specification, it does
+ not hold in WebKit when parsing a DocumentFragment. This is because WebKit
+ has an optimization causing us to have a DocumentFragment as root element
+ when parsing a fragment. See the following constructor:
+ "HTMLTreeBuilder(HTMLDocumentParser&, DocumentFragment&, Element&, ParserContentPolicy, const HTMLParserOptions&)"
+
+ which has the following code:
+ """
+ // https://html.spec.whatwg.org/multipage/syntax.html#parsing-html-fragments
+ // For efficiency, we skip step 5 ("Let root be a new html element with no attributes") and instead use the DocumentFragment as a root node.
+ m_tree.openElements().pushRootNode(HTMLStackItem::create(fragment));
+ """
+
+ Update the assertion to expect a DocumentFragment as root element when parsing
+ a fragment, and keep expecting an <html> element otherwise.
+
+ Test: fast/parser/fragment-with-frameset-crash.html
+
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+
</ins><span class="cx"> 2017-03-22 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r214125. rdar://problem/30921831
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (214514 => 214515)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2017-03-29 01:56:16 UTC (rev 214514)
+++ branches/safari-603-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2017-03-29 03:28:05 UTC (rev 214515)
</span><span class="lines">@@ -595,7 +595,9 @@
</span><span class="cx"> m_tree.openElements().bodyElement().remove();
</span><span class="cx"> m_tree.openElements().popUntil(m_tree.openElements().bodyElement());
</span><span class="cx"> m_tree.openElements().popHTMLBodyElement();
</span><del>- ASSERT(&m_tree.openElements().top() == &m_tree.openElements().htmlElement());
</del><ins>+ // Note: in the fragment case the root is a DocumentFragment instead of a proper html element which is a quirk / optimization in WebKit.
+ ASSERT(!isParsingFragment() || is<DocumentFragment>(m_tree.openElements().topNode()));
+ ASSERT(isParsingFragment() || &m_tree.openElements().top() == &m_tree.openElements().htmlElement());
</ins><span class="cx"> m_tree.insertHTMLElement(WTFMove(token));
</span><span class="cx"> m_insertionMode = InsertionMode::InFrameset;
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>