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

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

Issue 2014483003: Rename OwnPtr::clear() to reset() in core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 unsigned totalRows = m_grid.size(); 1134 unsigned totalRows = m_grid.size();
1135 unsigned nEffCols = table()->numEffectiveColumns(); 1135 unsigned nEffCols = table()->numEffectiveColumns();
1136 computeOverflowFromCells(totalRows, nEffCols); 1136 computeOverflowFromCells(totalRows, nEffCols);
1137 } 1137 }
1138 1138
1139 void LayoutTableSection::computeOverflowFromCells(unsigned totalRows, unsigned n EffCols) 1139 void LayoutTableSection::computeOverflowFromCells(unsigned totalRows, unsigned n EffCols)
1140 { 1140 {
1141 unsigned totalCellsCount = nEffCols * totalRows; 1141 unsigned totalCellsCount = nEffCols * totalRows;
1142 unsigned maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeTo UseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFast PaintPath * totalCellsCount; 1142 unsigned maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeTo UseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFast PaintPath * totalCellsCount;
1143 1143
1144 m_overflow.clear(); 1144 m_overflow.reset();
1145 m_overflowingCells.clear(); 1145 m_overflowingCells.clear();
1146 m_forceSlowPaintPathWithOverflowingCell = false; 1146 m_forceSlowPaintPathWithOverflowingCell = false;
1147 #if ENABLE(ASSERT) 1147 #if ENABLE(ASSERT)
1148 bool hasOverflowingCell = false; 1148 bool hasOverflowingCell = false;
1149 #endif 1149 #endif
1150 // Now that our height has been determined, add in overflow from cells. 1150 // Now that our height has been determined, add in overflow from cells.
1151 for (unsigned r = 0; r < totalRows; r++) { 1151 for (unsigned r = 0; r < totalRows; r++) {
1152 for (unsigned c = 0; c < nEffCols; c++) { 1152 for (unsigned c = 0; c < nEffCols; c++) {
1153 CellStruct& cs = cellAt(r, c); 1153 CellStruct& cs = cellAt(r, c);
1154 LayoutTableCell* cell = cs.primaryCell(); 1154 LayoutTableCell* cell = cs.primaryCell();
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691). 1664 // FIXME: The table's direction should determine our row's direction, not th e section's (see bug 96691).
1665 if (!style()->isLeftToRightDirection()) 1665 if (!style()->isLeftToRightDirection())
1666 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[table() ->numEffectiveColumns()] - table()->effectiveColumnPositions()[table()->absolute ColumnToEffectiveColumn(cell->absoluteColumnIndex() + cell->colSpan())] + horizo ntalBorderSpacing)); 1666 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[table() ->numEffectiveColumns()] - table()->effectiveColumnPositions()[table()->absolute ColumnToEffectiveColumn(cell->absoluteColumnIndex() + cell->colSpan())] + horizo ntalBorderSpacing));
1667 else 1667 else
1668 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[effecti veColumn] + horizontalBorderSpacing)); 1668 cellLocation.setX(LayoutUnit(table()->effectiveColumnPositions()[effecti veColumn] + horizontalBorderSpacing));
1669 1669
1670 cell->setLogicalLocation(cellLocation); 1670 cell->setLogicalLocation(cellLocation);
1671 } 1671 }
1672 1672
1673 } // namespace blink 1673 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTableRow.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698