<!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>[190099] 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/190099">190099</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 19:57:44 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update HTMLTableRowElement.rowIndex to behave according to the specification
https://bugs.webkit.org/show_bug.cgi?id=148842
<rdar://problem/22586914>
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
Rebaseline W3C HTML test now that one more check is passing.
* web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt:
Source/WebCore:
Update HTMLTableRowElement.rowIndex to behave according to the
specification:
https://html.spec.whatwg.org/multipage/tables.html#dom-tr-rowindex
In particular, rowIndex no longer returns -1 for <tr> elements that are
direct children of the table Element. Also,<tr> Elements in all <thead> /
<tfoot> children of the table Element now get a rowIndex, as per the
specification:
- https://html.spec.whatwg.org/multipage/tables.html#dom-table-rows
Previously, only <tr> elements in the first <thead> and the first <tbody>
children of the table would get a rowIndex.
Also, we now abort early and return -1 if the row is a grand-child of a
table element but its direct parent is not a <thead> / <tbody> / <tfoot>.
This avoid unnecessary traversal and matches the specification.
The code is refactored a bit to leverage HTMLTableElement.rows(), as
per the specification:
"return the index of the tr element in that table element's rows collection"
Previously, we would duplicate the table traversal logic. This
simplifies the code and fixes a bug as the traversal logic was slightly
different here and in HTMLTableRowsCollection. Because of this, only
<tr> elements in the first <thead> / <tfoot> would get a rowIndex.
Performance should be similar.
No new tests, already covered by existing test.
* html/HTMLTableRowElement.cpp:
(WebCore::HTMLTableRowElement::rowIndex):
(WebCore::HTMLTableRowElement::sectionRowIndex): Deleted.
(WebCore::HTMLTableRowElement::insertCell): Deleted.
LayoutTests:
Rebaseline existing test because rows in all <thead> / <tfoot> children
of the <table> Element now get a rowIndex.
* platform/mac/fast/table/rowindex-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticstabulardatathetrelementrowIndexexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttablerowindexexpectedtxt">trunk/LayoutTests/platform/mac/fast/table/rowindex-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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/LayoutTests/ChangeLog 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-21 Chris Dumez <cdumez@apple.com>
+
+ Update HTMLTableRowElement.rowIndex to behave according to the specification
+ https://bugs.webkit.org/show_bug.cgi?id=148842
+ <rdar://problem/22586914>
+
+ Reviewed by Darin Adler.
+
+ Rebaseline existing test because rows in all <thead> / <tfoot> children
+ of the <table> Element now get a rowIndex.
+
+ * platform/mac/fast/table/rowindex-expected.txt:
+
</ins><span class="cx"> 2015-09-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add more rendering tests for shadow DOM
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-09-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Update HTMLTableRowElement.rowIndex to behave according to the specification
+ https://bugs.webkit.org/show_bug.cgi?id=148842
+ <rdar://problem/22586914>
+
+ Reviewed by Darin Adler.
+
+ Rebaseline W3C HTML test now that one more check is passing.
+
+ * web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt:
+
+2015-09-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [JS Bindings] prototype.constructor should be writable
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149412
</span><span class="cx"> <rdar://problem/22545096>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticstabulardatathetrelementrowIndexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/tabular-data/the-tr-element/rowIndex-expected.txt 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> PASS HTMLTableRowElement.rowIndex 1
</span><span class="cx"> PASS HTMLTableRowElement.rowIndex 2
</span><span class="cx"> PASS HTMLTableRowElement.rowIndex 3
</span><del>-FAIL HTMLTableRowElement.rowIndex 4 assert_equals: expected 0 but got -1
</del><ins>+PASS HTMLTableRowElement.rowIndex 4
</ins><span class="cx"> PASS HTMLTableRowElement.rowIndex 5
</span><span class="cx"> PASS HTMLTableRowElement.rowIndex 6
</span><span class="cx"> PASS HTMLTableRowElement.rowIndex 7
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttablerowindexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/table/rowindex-expected.txt (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/table/rowindex-expected.txt 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/LayoutTests/platform/mac/fast/table/rowindex-expected.txt 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx"> text run at (2,2) width 112: "table C, footer A row A"
</span><span class="cx"> RenderTableCell {TD} at (123,0) size 76x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 6"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 8"
</ins><span class="cx"> RenderTableRow {TR} at (0,18) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,18) size 119x16 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 110x12
</span><span class="cx"> text run at (2,2) width 110: "table C, footer A row B"
</span><span class="cx"> RenderTableCell {TD} at (123,18) size 76x16 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 7"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 9"
</ins><span class="cx"> RenderTableSection {TFOOT} at (1,39) size 201x36
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,0) size 119x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="lines">@@ -88,14 +88,14 @@
</span><span class="cx"> text run at (2,2) width 110: "table C, footer B row A"
</span><span class="cx"> RenderTableCell {TD} at (123,0) size 76x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 72x12
</span><del>- text run at (2,2) width 72: "rowIndex = -1"
</del><ins>+ text run at (2,2) width 72: "rowIndex = 10"
</ins><span class="cx"> RenderTableRow {TR} at (0,18) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,18) size 119x16 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 109x12
</span><span class="cx"> text run at (2,2) width 109: "table C, footer B row B"
</span><span class="cx"> RenderTableCell {TD} at (123,18) size 76x16 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 72x12
</span><del>- text run at (2,2) width 72: "rowIndex = -1"
</del><ins>+ text run at (2,2) width 72: "rowIndex = 11"
</ins><span class="cx"> RenderTableSection {TBODY} at (1,75) size 201x36
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,0) size 119x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="lines">@@ -103,14 +103,14 @@
</span><span class="cx"> text run at (2,2) width 106: "table C, body A row A"
</span><span class="cx"> RenderTableCell {TD} at (123,0) size 76x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 2"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 4"
</ins><span class="cx"> RenderTableRow {TR} at (0,18) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,18) size 119x16 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 105x12
</span><span class="cx"> text run at (2,2) width 105: "table C, body A row B"
</span><span class="cx"> RenderTableCell {TD} at (123,18) size 76x16 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 3"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 5"
</ins><span class="cx"> RenderTableSection {TBODY} at (1,111) size 201x36
</span><span class="cx"> RenderTableRow {TR} at (0,0) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,0) size 119x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="lines">@@ -118,14 +118,14 @@
</span><span class="cx"> text run at (2,2) width 105: "table C, body B row A"
</span><span class="cx"> RenderTableCell {TD} at (123,0) size 76x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 4"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 6"
</ins><span class="cx"> RenderTableRow {TR} at (0,18) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,18) size 119x16 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 104x12
</span><span class="cx"> text run at (2,2) width 104: "table C, body B row B"
</span><span class="cx"> RenderTableCell {TD} at (123,18) size 76x16 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 66x12
</span><del>- text run at (2,2) width 66: "rowIndex = 5"
</del><ins>+ text run at (2,2) width 66: "rowIndex = 7"
</ins><span class="cx"> RenderTableSection {THEAD} at (1,1) size 201x38
</span><span class="cx"> RenderTableRow {TR} at (0,2) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,2) size 119x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
</span><span class="lines">@@ -147,12 +147,12 @@
</span><span class="cx"> RenderText {#text} at (2,2) size 114x12
</span><span class="cx"> text run at (2,2) width 114: "table C, header B row A"
</span><span class="cx"> RenderTableCell {TD} at (123,0) size 76x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
</span><del>- RenderText {#text} at (2,2) size 72x12
- text run at (2,2) width 72: "rowIndex = -1"
</del><ins>+ RenderText {#text} at (2,2) size 66x12
+ text run at (2,2) width 66: "rowIndex = 2"
</ins><span class="cx"> RenderTableRow {TR} at (0,18) size 201x16
</span><span class="cx"> RenderTableCell {TD} at (2,18) size 119x16 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
</span><span class="cx"> RenderText {#text} at (2,2) size 113x12
</span><span class="cx"> text run at (2,2) width 113: "table C, header B row B"
</span><span class="cx"> RenderTableCell {TD} at (123,18) size 76x16 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
</span><del>- RenderText {#text} at (2,2) size 72x12
- text run at (2,2) width 72: "rowIndex = -1"
</del><ins>+ RenderText {#text} at (2,2) size 66x12
+ text run at (2,2) width 66: "rowIndex = 3"
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/Source/WebCore/ChangeLog 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-09-21 Chris Dumez <cdumez@apple.com>
+
+ Update HTMLTableRowElement.rowIndex to behave according to the specification
+ https://bugs.webkit.org/show_bug.cgi?id=148842
+ <rdar://problem/22586914>
+
+ Reviewed by Darin Adler.
+
+ Update HTMLTableRowElement.rowIndex to behave according to the
+ specification:
+ https://html.spec.whatwg.org/multipage/tables.html#dom-tr-rowindex
+
+ In particular, rowIndex no longer returns -1 for <tr> elements that are
+ direct children of the table Element. Also,<tr> Elements in all <thead> /
+ <tfoot> children of the table Element now get a rowIndex, as per the
+ specification:
+ - https://html.spec.whatwg.org/multipage/tables.html#dom-table-rows
+
+ Previously, only <tr> elements in the first <thead> and the first <tbody>
+ children of the table would get a rowIndex.
+
+ Also, we now abort early and return -1 if the row is a grand-child of a
+ table element but its direct parent is not a <thead> / <tbody> / <tfoot>.
+ This avoid unnecessary traversal and matches the specification.
+
+ The code is refactored a bit to leverage HTMLTableElement.rows(), as
+ per the specification:
+ "return the index of the tr element in that table element's rows collection"
+
+ Previously, we would duplicate the table traversal logic. This
+ simplifies the code and fixes a bug as the traversal logic was slightly
+ different here and in HTMLTableRowsCollection. Because of this, only
+ <tr> elements in the first <thead> / <tfoot> would get a rowIndex.
+ Performance should be similar.
+
+ No new tests, already covered by existing test.
+
+ * html/HTMLTableRowElement.cpp:
+ (WebCore::HTMLTableRowElement::rowIndex):
+ (WebCore::HTMLTableRowElement::sectionRowIndex): Deleted.
+ (WebCore::HTMLTableRowElement::insertCell): Deleted.
+
</ins><span class="cx"> 2015-09-21 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix release builds with security assertion after r190007.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.cpp (190098 => 190099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-09-22 02:26:28 UTC (rev 190098)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-09-22 02:57:44 UTC (rev 190099)
</span><span class="lines">@@ -56,51 +56,26 @@
</span><span class="cx">
</span><span class="cx"> int HTMLTableRowElement::rowIndex() const
</span><span class="cx"> {
</span><del>- ContainerNode* table = parentNode();
- if (!table)
</del><ins>+ auto* parent = parentNode();
+ if (!parent)
</ins><span class="cx"> return -1;
</span><del>- table = table->parentNode();
- if (!is<HTMLTableElement>(table))
- return -1;
</del><span class="cx">
</span><del>- // To match Firefox, the row indices work like this:
- // Rows from the first <thead> are numbered before all <tbody> rows.
- // Rows from the first <tfoot> are numbered after all <tbody> rows.
- // Rows from other <thead> and <tfoot> elements don't get row indices at all.
-
- int rIndex = 0;
-
- if (HTMLTableSectionElement* head = downcast<HTMLTableElement>(*table).tHead()) {
- for (Node *row = head->firstChild(); row; row = row->nextSibling()) {
- if (row == this)
- return rIndex;
- if (row->hasTagName(trTag))
- ++rIndex;
- }
</del><ins>+ HTMLTableElement* table;
+ if (is<HTMLTableElement>(*parent))
+ table = downcast<HTMLTableElement>(parent);
+ else {
+ if (!is<HTMLTableSectionElement>(*parent) || !is<HTMLTableElement>(parent->parentNode()))
+ return -1;
+ table = downcast<HTMLTableElement>(parent->parentNode());
</ins><span class="cx"> }
</span><del>-
- for (Node *node = table->firstChild(); node; node = node->nextSibling()) {
- if (node->hasTagName(tbodyTag)) {
- HTMLTableSectionElement& section = downcast<HTMLTableSectionElement>(*node);
- for (Node* row = section.firstChild(); row; row = row->nextSibling()) {
- if (row == this)
- return rIndex;
- if (row->hasTagName(trTag))
- ++rIndex;
- }
- }
- }
</del><span class="cx">
</span><del>- if (HTMLTableSectionElement* foot = downcast<HTMLTableElement>(*table).tFoot()) {
- for (Node *row = foot->firstChild(); row; row = row->nextSibling()) {
- if (row == this)
- return rIndex;
- if (row->hasTagName(trTag))
- ++rIndex;
- }
</del><ins>+ auto rows = table->rows();
+ unsigned length = rows->length();
+ for (unsigned i = 0; i < length; ++i) {
+ if (rows->item(i) == this)
+ return i;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // We get here for rows that are in <thead> or <tfoot> sections other than the main header and footer.
</del><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>