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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutTable.cpp

Issue 2534413004: Made varied number of cells in each row based on row's requirement. (Closed)
Patch Set: Reset TestExpectations file Created 3 years, 11 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
Index: third_party/WebKit/Source/core/layout/LayoutTable.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTable.cpp b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
index a174e715635a4b59f6ae79ab9f2c5c4da7e15f1f..fbcca36daed954a685c6ff9347f3863df2f2e9ad 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTable.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTable.cpp
@@ -1445,8 +1445,7 @@ LayoutTableCell* LayoutTable::cellAbove(const LayoutTableCell* cell) const {
if (section) {
unsigned effCol =
absoluteColumnToEffectiveColumn(cell->absoluteColumnIndex());
- LayoutTableSection::CellStruct& aboveCell = section->cellAt(rAbove, effCol);
- return aboveCell.primaryCell();
+ return section->primaryCellAt(rAbove, effCol);
}
return nullptr;
}
@@ -1472,8 +1471,7 @@ LayoutTableCell* LayoutTable::cellBelow(const LayoutTableCell* cell) const {
if (section) {
unsigned effCol =
absoluteColumnToEffectiveColumn(cell->absoluteColumnIndex());
- LayoutTableSection::CellStruct& belowCell = section->cellAt(rBelow, effCol);
- return belowCell.primaryCell();
+ return section->primaryCellAt(rBelow, effCol);
}
return nullptr;
}
@@ -1498,8 +1496,6 @@ LayoutTableCell* LayoutTable::cellAfter(const LayoutTableCell* cell) const {
unsigned effCol = absoluteColumnToEffectiveColumn(
cell->absoluteColumnIndex() + cell->colSpan());
- if (effCol >= numEffectiveColumns())
- return nullptr;
return cell->section()->primaryCellAt(cell->rowIndex(), effCol);
}

Powered by Google App Engine
This is Rietveld 408576698