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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTableSection.cpp

Issue 1653673002: Even more explicit LayoutUnit conversion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moarConstructors
Patch Set: address comments Created 4 years, 10 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 unified diff | Download patch
OLDNEW
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, 2013 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All r ights 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 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 else 719 else
720 m_rowPos[0] = 0; 720 m_rowPos[0] = 0;
721 721
722 SpanningLayoutTableCells rowSpanCells; 722 SpanningLayoutTableCells rowSpanCells;
723 #if ENABLE(ASSERT) 723 #if ENABLE(ASSERT)
724 HashSet<const LayoutTableCell*> uniqueCells; 724 HashSet<const LayoutTableCell*> uniqueCells;
725 #endif 725 #endif
726 726
727 for (unsigned r = 0; r < m_grid.size(); r++) { 727 for (unsigned r = 0; r < m_grid.size(); r++) {
728 m_grid[r].baseline = -1; 728 m_grid[r].baseline = -1;
729 LayoutUnit baselineDescent = 0; 729 LayoutUnit baselineDescent;
730 730
731 if (m_grid[r].logicalHeight.isSpecified()) { 731 if (m_grid[r].logicalHeight.isSpecified()) {
732 // Our base size is the biggest logical height from our cells' style s (excluding row spanning cells). 732 // Our base size is the biggest logical height from our cells' style s (excluding row spanning cells).
733 m_rowPos[r + 1] = std::max(m_rowPos[r] + minimumValueForLength(m_gri d[r].logicalHeight, 0).round(), 0); 733 m_rowPos[r + 1] = std::max(m_rowPos[r] + minimumValueForLength(m_gri d[r].logicalHeight, 0).round(), 0);
734 } else { 734 } else {
735 // Non-specified lengths are ignored because the row already account s for the cells 735 // Non-specified lengths are ignored because the row already account s for the cells
736 // intrinsic logical height. 736 // intrinsic logical height.
737 m_rowPos[r + 1] = std::max(m_rowPos[r], 0); 737 m_rowPos[r + 1] = std::max(m_rowPos[r], 0);
738 } 738 }
739 739
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691). 1641 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691).
1642 if (!style()->isLeftToRightDirection()) 1642 if (!style()->isLeftToRightDirection())
1643 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing); 1643 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing);
1644 else 1644 else
1645 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont alBorderSpacing); 1645 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont alBorderSpacing);
1646 1646
1647 cell->setLogicalLocation(cellLocation); 1647 cell->setLogicalLocation(cellLocation);
1648 } 1648 }
1649 1649
1650 } // namespace blink 1650 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTable.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698