| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/paint/TableSectionPainter.h" | 5 #include "core/paint/TableSectionPainter.h" |
| 6 | 6 |
| 7 #include "core/layout/LayoutTableCell.h" | 7 #include "core/layout/LayoutTableCell.h" |
| 8 #include "core/layout/LayoutTableCol.h" | 8 #include "core/layout/LayoutTableCol.h" |
| 9 #include "core/layout/LayoutTableRow.h" | 9 #include "core/layout/LayoutTableRow.h" |
| 10 #include "core/paint/BoxClipper.h" | 10 #include "core/paint/BoxClipper.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 // TODO(crbug.com/577282): This painting order is inconsistent with other | 270 // TODO(crbug.com/577282): This painting order is inconsistent with other |
| 271 // outlines. | 271 // outlines. |
| 272 if (row && !row->HasSelfPaintingLayer() && | 272 if (row && !row->HasSelfPaintingLayer() && |
| 273 ShouldPaintSelfOutline(paint_info_for_descendants.phase)) { | 273 ShouldPaintSelfOutline(paint_info_for_descendants.phase)) { |
| 274 TableRowPainter(*row).PaintOutline(paint_info_for_descendants, | 274 TableRowPainter(*row).PaintOutline(paint_info_for_descendants, |
| 275 paint_offset); | 275 paint_offset); |
| 276 } | 276 } |
| 277 unsigned n_cols = layout_table_section_.NumCols(r); | 277 unsigned n_cols = layout_table_section_.NumCols(r); |
| 278 for (unsigned c = dirtied_columns.Start(); | 278 for (unsigned c = dirtied_columns.Start(); |
| 279 c < n_cols && c < dirtied_columns.end(); c++) { | 279 c < n_cols && c < dirtied_columns.end(); c++) { |
| 280 const auto& cell_struct = layout_table_section_.CellAt(r, c); | 280 for (const auto* cell : |
| 281 for (const auto* cell : cell_struct.cells) { | 281 layout_table_section_.GridCellAt(r, c).Cells()) { |
| 282 if (overflowing_cells.Contains(cell)) | 282 if (overflowing_cells.Contains(cell)) |
| 283 continue; | 283 continue; |
| 284 if (cell->RowSpan() > 1 || cell->ColSpan() > 1) { | 284 if (cell->RowSpan() > 1 || cell->ColSpan() > 1) { |
| 285 if (!spanning_cells.insert(cell).is_new_entry) | 285 if (!spanning_cells.insert(cell).is_new_entry) |
| 286 continue; | 286 continue; |
| 287 } | 287 } |
| 288 cells.push_back(cell); | 288 cells.push_back(cell); |
| 289 } | 289 } |
| 290 } | 290 } |
| 291 } | 291 } |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 const PaintInfo& paint_info_for_cells, | 402 const PaintInfo& paint_info_for_cells, |
| 403 const LayoutPoint& paint_offset) { | 403 const LayoutPoint& paint_offset) { |
| 404 if (!cell.HasSelfPaintingLayer() && !cell.Row()->HasSelfPaintingLayer()) { | 404 if (!cell.HasSelfPaintingLayer() && !cell.Row()->HasSelfPaintingLayer()) { |
| 405 LayoutPoint cell_point = | 405 LayoutPoint cell_point = |
| 406 layout_table_section_.FlipForWritingModeForChild(&cell, paint_offset); | 406 layout_table_section_.FlipForWritingModeForChild(&cell, paint_offset); |
| 407 cell.Paint(paint_info_for_cells, cell_point); | 407 cell.Paint(paint_info_for_cells, cell_point); |
| 408 } | 408 } |
| 409 } | 409 } |
| 410 | 410 |
| 411 } // namespace blink | 411 } // namespace blink |
| OLD | NEW |