diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-02 11:42:56 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | 3882ca86c53f9b27a768fd8e6dd926de341d31f9 (patch) | |
| tree | d03f033f2e890d34006551abaa2396d5d62d31ab | |
| parent | 2dcd436053d06d973c7205b3f61e69fb405b4150 (diff) | |
| download | external_webkit-3882ca86c53f9b27a768fd8e6dd926de341d31f9.zip external_webkit-3882ca86c53f9b27a768fd8e6dd926de341d31f9.tar.gz external_webkit-3882ca86c53f9b27a768fd8e6dd926de341d31f9.tar.bz2 | |
Merge WebKit at r64264 : Compile fix: CellStruct changed.
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.h
Change-Id: I52787b9723791822d9c95ef52d7a81c23c2aeca7
| -rw-r--r-- | WebCore/rendering/RenderTableSection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp index 28da126..c439a13 100644 --- a/WebCore/rendering/RenderTableSection.cpp +++ b/WebCore/rendering/RenderTableSection.cpp @@ -464,11 +464,11 @@ int RenderTableSection::layoutRows(int toAdd) for (int r = 0; r < totalRows; r++) { for (int c = 0; c < nEffCols; c++) { CellStruct current = cellAt(r, c); - RenderTableCell* cell = current.cell; + RenderTableCell* cell = current.primaryCell(); if (!cell || current.inColSpan) continue; - if (r > 0 && (cellAt(r-1, c).cell == cell)) + if (r > 0 && (primaryCellAt(r-1, c) == cell)) continue; // cell->setCellTopExtra(0); |