Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: third_party/WebKit/WebCore/page/AccessibilityTable.cpp

Issue 46097: WebKit merge 41660:41709 (WebKit side).... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/WebCore/make-generated-sources.sh ('k') | third_party/WebKit/WebCore/page/Chrome.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/WebCore/page/AccessibilityTable.cpp
===================================================================
--- third_party/WebKit/WebCore/page/AccessibilityTable.cpp (revision 11711)
+++ third_party/WebKit/WebCore/page/AccessibilityTable.cpp (working copy)
@@ -386,11 +386,13 @@
unsigned rowOffset = 0;
while (tableSection) {
- rowCount += tableSection->numRows();
+ unsigned numRows = tableSection->numRows();
unsigned numCols = tableSection->numColumns();
- if (row < rowCount && column < numCols) {
- int sectionSpecificRow = row - rowOffset;
+ rowCount += numRows;
+
+ unsigned sectionSpecificRow = row - rowOffset;
+ if (row < rowCount && column < numCols && sectionSpecificRow < numRows) {
cell = tableSection->cellAt(sectionSpecificRow, column).cell;
// we didn't find the cell, which means there's spanning happening
@@ -422,9 +424,9 @@
if (cell)
break;
- rowOffset += rowCount;
+ rowOffset += numRows;
// we didn't find anything between the rows we should have
- if (row < rowOffset)
+ if (row < rowCount)
break;
tableSection = table->sectionBelow(tableSection, true);
}
« no previous file with comments | « third_party/WebKit/WebCore/make-generated-sources.sh ('k') | third_party/WebKit/WebCore/page/Chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698