OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) |
3 * (C) 1997 Torben Weis (weis@kde.org) | 3 * (C) 1997 Torben Weis (weis@kde.org) |
4 * (C) 1998 Waldo Bastian (bastian@kde.org) | 4 * (C) 1998 Waldo Bastian (bastian@kde.org) |
5 * (C) 1999 Lars Knoll (knoll@kde.org) | 5 * (C) 1999 Lars Knoll (knoll@kde.org) |
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved. |
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
418 m_rowPos[row] += extraHeightToPropagate; | 418 m_rowPos[row] += extraHeightToPropagate; |
419 } | 419 } |
420 | 420 |
421 lastRowIndex = rowIndex; | 421 lastRowIndex = rowIndex; |
422 lastRowSpan = rowSpan; | 422 lastRowSpan = rowSpan; |
423 | 423 |
424 struct SpanningRowsHeight spanningRowsHeight; | 424 struct SpanningRowsHeight spanningRowsHeight; |
425 | 425 |
426 populateSpanningRowsHeightFromCell(cell, spanningRowsHeight); | 426 populateSpanningRowsHeightFromCell(cell, spanningRowsHeight); |
427 | 427 |
428 if (!spanningRowsHeight.totalRowsHeight || spanningRowsHeight.spanningCe llHeightIgnoringBorderSpacing <= spanningRowsHeight.totalRowsHeight) | 428 if (!spanningRowsHeight.totalRowsHeight || spanningRowsHeight.spanningCe llHeightIgnoringBorderSpacing <= spanningRowsHeight.totalRowsHeight) { |
429 m_rowPos[rowIndex + rowSpan] -= extraHeightToPropagate; | |
Julien - ping for review
2013/08/06 18:08:08
*sigh*, this is called wac-a-molling. The minute y
| |
429 continue; | 430 continue; |
431 } | |
430 | 432 |
431 int totalPercent = 0; | 433 int totalPercent = 0; |
432 int totalAutoRowsHeight = 0; | 434 int totalAutoRowsHeight = 0; |
433 int totalRemainingRowsHeight = spanningRowsHeight.totalRowsHeight; | 435 int totalRemainingRowsHeight = spanningRowsHeight.totalRowsHeight; |
434 | 436 |
435 // FIXME: Inner spanning cell height should not change if it have fixed height when it's parent spanning cell | 437 // FIXME: Inner spanning cell height should not change if it have fixed height when it's parent spanning cell |
436 // is distributing it's extra height in rows. | 438 // is distributing it's extra height in rows. |
437 | 439 |
438 // Calculate total percentage, total auto rows height and total rows hei ght except percent rows. | 440 // Calculate total percentage, total auto rows height and total rows hei ght except percent rows. |
439 for (unsigned row = rowIndex; row < (rowIndex + rowSpan); row++) { | 441 for (unsigned row = rowIndex; row < (rowIndex + rowSpan); row++) { |
(...skipping 1235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1675 if (!style()->isLeftToRightDirection()) | 1677 if (!style()->isLeftToRightDirection()) |
1676 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing); | 1678 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing); |
1677 else | 1679 else |
1678 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont alBorderSpacing); | 1680 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont alBorderSpacing); |
1679 | 1681 |
1680 cell->setLogicalLocation(cellLocation); | 1682 cell->setLogicalLocation(cellLocation); |
1681 view()->addLayoutDelta(oldCellLocation - cell->location()); | 1683 view()->addLayoutDelta(oldCellLocation - cell->location()); |
1682 } | 1684 } |
1683 | 1685 |
1684 } // namespace WebCore | 1686 } // namespace WebCore |
OLD | NEW |