<!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>[190337] 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/190337">190337</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-29 21:31:18 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>sectionRowIndex must return -1 when its parent is not a table, tbody, thead, or tfoot
https://bugs.webkit.org/show_bug.cgi?id=148841
<rdar://problem/22586870>
Reviewed by Ryosuke Niwa.
LayoutTests/imported/w3c:
Rebaseline W3C HTML test now that more checks are passing.
* web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt:
Source/WebCore:
Update HTMLTableRowElement.sectionRowIndex to match the specification:
https://html.spec.whatwg.org/multipage/tables.html#dom-tr-sectionrowindex
In particular, it now returns -1 if the parent is not a table, tbody,
thead and tfoot.
No new tests, already covered by existing test.
* html/HTMLTableRowElement.cpp:
(WebCore::HTMLTableRowElement::sectionRowIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticstabulardatathetrelementsectionRowIndexexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowElementcpp">trunk/Source/WebCore/html/HTMLTableRowElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (190336 => 190337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-30 01:30:22 UTC (rev 190336)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-30 04:31:18 UTC (rev 190337)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-09-29 Chris Dumez <cdumez@apple.com>
+
+ sectionRowIndex must return -1 when its parent is not a table, tbody, thead, or tfoot
+ https://bugs.webkit.org/show_bug.cgi?id=148841
+ <rdar://problem/22586870>
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline W3C HTML test now that more checks are passing.
+
+ * web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt:
+
</ins><span class="cx"> 2015-09-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop support for legacy EventException
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticstabulardatathetrelementsectionRowIndexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt (190336 => 190337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt 2015-09-30 01:30:22 UTC (rev 190336)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/sectionRowIndex-expected.txt 2015-09-30 04:31:18 UTC (rev 190337)
</span><span class="lines">@@ -8,12 +8,12 @@
</span><span class="cx"> PASS Row in implicit tbody in nested table in HTML
</span><span class="cx"> PASS Row in explicit tbody in nested table in HTML
</span><span class="cx"> PASS Row in script-created table
</span><del>-FAIL Row in script-created div in table assert_equals: expected -1 but got 0
</del><ins>+PASS Row in script-created div in table
</ins><span class="cx"> PASS Row in script-created thead in table
</span><span class="cx"> PASS Row in script-created tbody in table
</span><span class="cx"> PASS Row in script-created tfoot in table
</span><del>-FAIL Row in script-created tr in tbody in table assert_equals: expected -1 but got 0
-FAIL Row in script-created td in tr in tbody in table assert_equals: expected -1 but got 0
</del><ins>+PASS Row in script-created tr in tbody in table
+PASS Row in script-created td in tr in tbody in table
</ins><span class="cx"> PASS Row in script-created nested table
</span><span class="cx"> PASS Row in script-created thead in nested table
</span><span class="cx"> PASS Row in script-created tbody in nested table
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190336 => 190337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-30 01:30:22 UTC (rev 190336)
+++ trunk/Source/WebCore/ChangeLog 2015-09-30 04:31:18 UTC (rev 190337)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-09-29 Chris Dumez <cdumez@apple.com>
+
+ sectionRowIndex must return -1 when its parent is not a table, tbody, thead, or tfoot
+ https://bugs.webkit.org/show_bug.cgi?id=148841
+ <rdar://problem/22586870>
+
+ Reviewed by Ryosuke Niwa.
+
+ Update HTMLTableRowElement.sectionRowIndex to match the specification:
+ https://html.spec.whatwg.org/multipage/tables.html#dom-tr-sectionrowindex
+
+ In particular, it now returns -1 if the parent is not a table, tbody,
+ thead and tfoot.
+
+ No new tests, already covered by existing test.
+
+ * html/HTMLTableRowElement.cpp:
+ (WebCore::HTMLTableRowElement::sectionRowIndex):
+
</ins><span class="cx"> 2015-09-29 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Make WebKit for iOS Simulator build with the public iOS 9 SDK
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.cpp (190336 => 190337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-09-30 01:30:22 UTC (rev 190336)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-09-30 04:31:18 UTC (rev 190337)
</span><span class="lines">@@ -81,16 +81,25 @@
</span><span class="cx">
</span><span class="cx"> int HTMLTableRowElement::sectionRowIndex() const
</span><span class="cx"> {
</span><del>- int rIndex = 0;
- const Node *n = this;
- do {
- n = n->previousSibling();
- if (n && n->hasTagName(trTag))
- rIndex++;
</del><ins>+ auto* parent = parentNode();
+ if (!parent)
+ return -1;
+
+ RefPtr<HTMLCollection> rows;
+ if (is<HTMLTableSectionElement>(*parent))
+ rows = downcast<HTMLTableSectionElement>(*parent).rows();
+ else if (is<HTMLTableElement>(*parent))
+ rows = downcast<HTMLTableElement>(*parent).rows();
+ else
+ return -1;
+
+ unsigned length = rows->length();
+ for (unsigned i = 0; i < length; ++i) {
+ if (rows->item(i) == this)
+ return i;
</ins><span class="cx"> }
</span><del>- while (n);
</del><span class="cx">
</span><del>- return rIndex;
</del><ins>+ return -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<HTMLTableCellElement> HTMLTableRowElement::insertCell(int index, ExceptionCode& ec)
</span></span></pre>
</div>
</div>
</body>
</html>