Combine and simplify LayoutTableSection::DirtiedRows() and DirtiedEffectiveColumns()

third_party/WebKit/Source/core/paint/TableRowPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/TableRowPainter.h"
 
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutTableRow.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
@@ skipping 14 matching lines @@
     PaintOutline(paint_info, paint_offset);
   if (paint_info.phase == kPaintPhaseSelfOutlineOnly)
     return;
 
   if (ShouldPaintSelfBlockBackground(paint_info.phase)) {
     const auto* section = layout_table_row_.Section();
     LayoutRect cull_rect = LayoutRect(paint_info.GetCullRect().rect_);
     cull_rect.MoveBy(layout_table_row_.PhysicalLocation(section));
     LayoutRect logical_rect_in_section =
         section->LogicalRectForWritingModeAndDirection(cull_rect);
-    CellSpan dirtied_columns =
-        section->DirtiedEffectiveColumns(logical_rect_in_section);
+    CellSpan dirtied_rows;
+    CellSpan dirtied_columns;
+    section->DirtiedRowsAndEffectiveColumns(logical_rect_in_section,
+                                            dirtied_rows, dirtied_columns);

[wkorman, 2017/05/16 20:30:11]

If we passed pointers rather than refs, could pass nullptr for dirtied_rows and
then skip computation. Assume computation is pretty cheap but maybe for huge
tables could be useful. Just a thought while reading.

[Xianzhu, 2017/05/17 00:33:21]

This is the only case that only one output is needed, and the case is rare
(table row has self-painting layer). Even if the caller only wants one, the
function itself still needs to compute both in some cases.

     PaintBoxDecorationBackground(paint_info, paint_offset, dirtied_columns);
   }
 
   if (paint_info.phase == kPaintPhaseSelfBlockBackgroundOnly)
     return;
 
   PaintInfo paint_info_for_cells = paint_info.ForDescendants();
   for (LayoutTableCell* cell = layout_table_row_.FirstCell(); cell;
        cell = cell->NextCell()) {
     if (!cell->HasSelfPaintingLayer())
@@ skipping 42 matching lines @@
                                        bounds);
   LayoutRect paint_rect(adjusted_paint_offset, layout_table_row_.Size());
 
   if (has_box_shadow) {
     BoxPainter::PaintNormalBoxShadow(paint_info, paint_rect,
                                      layout_table_row_.StyleRef());
   }
 
   if (has_background) {
     PaintInfo paint_info_for_cells = paint_info.ForDescendants();
-    for (auto c = dirtied_columns.Start(); c < dirtied_columns.end(); c++) {
+    for (auto c = dirtied_columns.Start(); c < dirtied_columns.End(); c++) {
       if (const auto* cell =
               section->OriginatingCellAt(layout_table_row_.RowIndex(), c))
         PaintBackgroundBehindCell(*cell, paint_info_for_cells, paint_offset);
     }
   }
 
   if (has_box_shadow) {
     // TODO(wangxianzhu): Calculate the inset shadow bounds by insetting
     // paintRect by half widths of collapsed borders.
     BoxPainter::PaintInsetBoxShadow(paint_info, paint_rect,
@@ skipping 12 matching lines @@
   // flipped blocks direction.
   if (!layout_table_row_.HasSelfPaintingLayer()) {
     cell_point = layout_table_row_.Section()->FlipForWritingModeForChild(
         &cell, cell_point);
   }
   TableCellPainter(cell).PaintContainerBackgroundBehindCell(
       paint_info, cell_point, layout_table_row_);
 }
 
 }  // namespace blink