<!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>[172834] 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/172834">172834</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-21 14:30:24 -0700 (Thu, 21 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>New ruby parsing rule breaks some real web sites.
https://bugs.webkit.org/show_bug.cgi?id=136062

Patch by Yuki Sekiguchi &lt;yuki.sekiguchi@access-company.com&gt; on 2014-08-21
Reviewed by Ryosuke Niwa.

Source/WebCore:

An RP element should not auto close an RTC element.

The HTML5.1 spec was changed:
http://www.w3.org/html/wg/drafts/html/master/syntax.html#parsing-main-inbody
This was done at the following commit:
https://github.com/w3c/html/commit/c61397b989b28235ee2228f280aa8d475f3b9ebf

This patch changed the RP element's behavior to follow the spec change.

Test: fast/ruby/rp-inside-rtc.html

* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processStartTagForInBody):

LayoutTests:

html5lib-test was updated using my pull request:
https://github.com/darobin/html5lib-tests/pull/2

* fast/ruby/rp-inside-rtc-expected.html: Added.
* fast/ruby/rp-inside-rtc.html: Added.
* html5lib/resources/ruby.dat: The rp element should not auto close the rtc element.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshtml5libresourcesrubydat">trunk/LayoutTests/html5lib/resources/ruby.dat</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrubyrpinsidertcexpectedhtml">trunk/LayoutTests/fast/ruby/rp-inside-rtc-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastrubyrpinsidertchtml">trunk/LayoutTests/fast/ruby/rp-inside-rtc.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172833 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-21 20:29:43 UTC (rev 172833)
+++ trunk/LayoutTests/ChangeLog        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
</span><span class="cx"> 
</span><ins>+        New ruby parsing rule breaks some real web sites.
+        https://bugs.webkit.org/show_bug.cgi?id=136062
+
+        Reviewed by Ryosuke Niwa.
+
+        html5lib-test was updated using my pull request:
+        https://github.com/darobin/html5lib-tests/pull/2
+
+        * fast/ruby/rp-inside-rtc-expected.html: Added.
+        * fast/ruby/rp-inside-rtc.html: Added.
+        * html5lib/resources/ruby.dat: The rp element should not auto close the rtc element.
+
+2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
+
</ins><span class="cx">         REGRESSION: CSS not() selector does not work when it appears after or within @supports
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=136063
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastrubyrpinsidertcexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/rp-inside-rtc-expected.html (0 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/rp-inside-rtc-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/ruby/rp-inside-rtc-expected.html        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;div style=&quot;color: green&quot;&gt;
+&lt;ruby&gt;&lt;rbc&gt;&lt;rb&gt;There &lt;/rb&gt;&lt;rb&gt;is &lt;/rb&gt;&lt;rb&gt;rb &lt;/rb&gt;&lt;rb&gt;inside &lt;/rb&gt;&lt;rb&gt;rbc, &lt;/rb&gt;&lt;rb&gt;and &lt;/rb&gt;&lt;rb&gt;it &lt;/rb&gt;&lt;rb&gt;should &lt;/rb&gt;&lt;rb&gt;be &lt;/rb&gt;&lt;rb&gt;green&lt;/rb&gt;&lt;/rbc&gt;&lt;rtc&gt;&lt;rp&gt;(There are rp &lt;/rp&gt;&lt;rt&gt;and &lt;/rt&gt;&lt;rt&gt;rt &lt;/rt&gt;&lt;rt&gt;inside &lt;/rt&gt;&lt;rt&gt;rtc, &lt;/rt&gt;&lt;rt&gt;and &lt;/rt&gt;&lt;rt&gt;they &lt;/rt&gt;&lt;rt&gt;should &lt;/rt&gt;&lt;rt&gt;be &lt;/rt&gt;&lt;rp&gt;green)&lt;/rp&gt;&lt;/rtc&gt;&lt;/ruby&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrubyrpinsidertchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/rp-inside-rtc.html (0 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/rp-inside-rtc.html                                (rev 0)
+++ trunk/LayoutTests/fast/ruby/rp-inside-rtc.html        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;style&gt;
+rbc &gt; rb, rtc &gt; rp, rtc &gt; rt { color:green; }
+&lt;/style&gt;
+&lt;div style=&quot;color: red&quot;&gt;
+&lt;ruby&gt;&lt;rbc&gt;&lt;rb&gt;There &lt;/rb&gt;&lt;rb&gt;is &lt;/rb&gt;&lt;rb&gt;rb &lt;/rb&gt;&lt;rb&gt;inside &lt;/rb&gt;&lt;rb&gt;rbc, &lt;/rb&gt;&lt;rb&gt;and &lt;/rb&gt;&lt;rb&gt;it &lt;/rb&gt;&lt;rb&gt;should &lt;/rb&gt;&lt;rb&gt;be &lt;/rb&gt;&lt;rb&gt;green&lt;/rb&gt;&lt;/rbc&gt;&lt;rtc&gt;&lt;rp&gt;(There are rp &lt;/rp&gt;&lt;rt&gt;and &lt;/rt&gt;&lt;rt&gt;rt &lt;/rt&gt;&lt;rt&gt;inside &lt;/rt&gt;&lt;rt&gt;rtc, &lt;/rt&gt;&lt;rt&gt;and &lt;/rt&gt;&lt;rt&gt;they &lt;/rt&gt;&lt;rt&gt;should &lt;/rt&gt;&lt;rt&gt;be &lt;/rt&gt;&lt;rp&gt;green)&lt;/rp&gt;&lt;/rtc&gt;&lt;/ruby&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestshtml5libresourcesrubydat"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/html5lib/resources/ruby.dat (172833 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/html5lib/resources/ruby.dat        2014-08-21 20:29:43 UTC (rev 172833)
+++ trunk/LayoutTests/html5lib/resources/ruby.dat        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> |       &quot;a&quot;
</span><span class="cx"> |       &lt;rtc&gt;
</span><span class="cx"> |         &quot;b&quot;
</span><del>-|       &lt;rp&gt;
</del><ins>+|         &lt;rp&gt;
</ins><span class="cx"> 
</span><span class="cx"> #data
</span><span class="cx"> &lt;html&gt;&lt;ruby&gt;a&lt;rtc&gt;b&lt;span&gt;&lt;/ruby&gt;&lt;/html&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172833 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-21 20:29:43 UTC (rev 172833)
+++ trunk/Source/WebCore/ChangeLog        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
</span><span class="cx"> 
</span><ins>+        New ruby parsing rule breaks some real web sites.
+        https://bugs.webkit.org/show_bug.cgi?id=136062
+
+        Reviewed by Ryosuke Niwa.
+
+        An RP element should not auto close an RTC element.
+
+        The HTML5.1 spec was changed:
+        http://www.w3.org/html/wg/drafts/html/master/syntax.html#parsing-main-inbody
+        This was done at the following commit:
+        https://github.com/w3c/html/commit/c61397b989b28235ee2228f280aa8d475f3b9ebf
+
+        This patch changed the RP element's behavior to follow the spec change.
+
+        Test: fast/ruby/rp-inside-rtc.html
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTagForInBody):
+
+2014-08-21  Yuki Sekiguchi  &lt;yuki.sekiguchi@access-company.com&gt;
+
</ins><span class="cx">         REGRESSION: CSS not() selector does not work when it appears after or within @supports
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=136063
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (172833 => 172834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp        2014-08-21 20:29:43 UTC (rev 172833)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp        2014-08-21 21:30:24 UTC (rev 172834)
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx">         m_tree.insertHTMLElement(token);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (token-&gt;name() == rbTag || token-&gt;name() == rpTag || token-&gt;name() == rtcTag) {
</del><ins>+    if (token-&gt;name() == rbTag || token-&gt;name() == rtcTag) {
</ins><span class="cx">         if (m_tree.openElements()-&gt;inScope(rubyTag.localName())) {
</span><span class="cx">             m_tree.generateImpliedEndTags();
</span><span class="cx">             if (!m_tree.currentStackItem()-&gt;hasTagName(rubyTag))
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx">         m_tree.insertHTMLElement(token);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (token-&gt;name() == rtTag) {
</del><ins>+    if (token-&gt;name() == rtTag || token-&gt;name() == rpTag) {
</ins><span class="cx">         if (m_tree.openElements()-&gt;inScope(rubyTag.localName())) {
</span><span class="cx">             m_tree.generateImpliedEndTagsWithExclusion(rtcTag.localName());
</span><span class="cx">             if (!m_tree.currentStackItem()-&gt;hasTagName(rubyTag) &amp;&amp; !m_tree.currentStackItem()-&gt;hasTagName(rtcTag))
</span></span></pre>
</div>
</div>

</body>
</html>