Fix LayoutTableRow::AddOverflowFromCell()

third_party/WebKit/Source/core/layout/LayoutTableRow.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013
 *                Apple Inc.
  *               All rights reserved.
  *
@@ skipping 274 matching lines @@
 }
 
 void LayoutTableRow::ComputeOverflow() {
   ClearAllOverflows();
   AddVisualEffectOverflow();
   for (LayoutTableCell* cell = FirstCell(); cell; cell = cell->NextCell())
     AddOverflowFromCell(cell);
 }
 
 void LayoutTableRow::AddOverflowFromCell(const LayoutTableCell* cell) {
-  // Non-row-spanning-cells don't create overflow (they are fully contained
-  // within this row).
-  // TODO(crbug.com/603993): This seems incorrect because cell may have visual
-  // effect overflow that should be included in this row.
-  if (cell->RowSpan() == 1)
-    return;
-
-  // Cells only generates visual overflow.
-  LayoutRect cell_visual_overflow_rect =
-      cell->VisualOverflowRectForPropagation(StyleRef());
-
-  // The cell and the row share the section's coordinate system. However
-  // the visual overflow should be determined in the coordinate system of
-  // the row, that's why we shift it below.
-  cell_visual_overflow_rect.MoveBy(-Location());
-  AddContentsVisualOverflow(cell_visual_overflow_rect);
-
   // Table row paints its background behind cells. If the cell spans multiple
   // rows, the row's visual rect should be expanded to cover the cell.
-  if (StyleRef().HasBackground()) {
+  // Here don't check background existence to avoid requirement to invalidate
+  // overflow on change of background existence.
+  if (cell->RowSpan() > 1) {
     LayoutRect cell_background_rect = cell->FrameRect();
     cell_background_rect.MoveBy(-Location());
     AddSelfVisualOverflow(cell_background_rect);
   }
+
+  // Should propagate cell's overflow to row if the cell has row span or has
+  // overflow.
+  if (cell->RowSpan() == 1 && !cell->HasOverflowModel())
+    return;
+
+  // The cell and the row share the section's coordinate system. However
+  // the visual overflow should be determined in the coordinate system of
+  // the row, that's why we shift the rects by cell_row_offset below.
+  LayoutSize cell_row_offset = cell->Location() - Location();
+
+  LayoutRect cell_visual_overflow_rect =
+      cell->VisualOverflowRectForPropagation(StyleRef());
+  cell_visual_overflow_rect.Move(cell_row_offset);
+  AddContentsVisualOverflow(cell_visual_overflow_rect);
+
+  LayoutRect cell_layout_overflow_rect =
+      cell->LayoutOverflowRectForPropagation(StyleRef());
+  cell_layout_overflow_rect.Move(cell_row_offset);
+  AddLayoutOverflow(cell_layout_overflow_rect);
 }
 
 bool LayoutTableRow::IsFirstRowInSectionAfterHeader() const {
   // If there isn't room on the page for at least one content row after the
   // header group, then we won't repeat the header on each page.
   // https://drafts.csswg.org/css-tables-3/#repeated-headers reads like
   // it wants us to drop headers on only the pages that a single row
   // won't fit but we avoid the complexity of that reading until it
   // is clarified. Tracked by crbug.com/675904
   if (RowIndex())
     return false;
   LayoutTableSection* header = Table()->Header();
   return header && Table()->SectionAbove(Section()) == header &&
          header->GetPaginationBreakability() != kAllowAnyBreaks;
 }
 
 }  // namespace blink