Improve LayoutTable outer collapsed border calculation

third_party/WebKit/Source/core/layout/LayoutTableSection.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, 2008, 2009, 2010, 2013 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
@@ skipping 72 matching lines @@
                 "Asserts below assume end_ is unsigned");
   CHECK_LE(start_, maximum_span_size);
   CHECK_LE(end_, maximum_span_size);
   CHECK_LE(start_, end_);
 }
 
 LayoutTableSection::LayoutTableSection(Element* element)
     : LayoutTableBoxComponent(element),
       c_col_(0),
       c_row_(0),
-      outer_border_start_(0),
-      outer_border_end_(0),
-      outer_border_before_(0),
-      outer_border_after_(0),
       needs_cell_recalc_(false),
       force_full_paint_(false),
       has_multiple_cell_levels_(false),
       has_spanning_cells_(false) {
   // init LayoutObject attributes
   SetInline(false);  // our object is not Inline
 }
 
 LayoutTableSection::~LayoutTableSection() {}
 
@@ skipping 1229 matching lines @@
   for (LayoutTableRow* row = FirstRow(); row; row = row->NextRow()) {
     for (LayoutTableCell* cell = row->FirstCell(); cell;
          cell = cell->NextCell()) {
       cell->SetPreferredLogicalWidthsDirty();
       if (what_to_mark == LayoutTable::kMarkDirtyAndNeedsLayout)
         cell->SetChildNeedsLayout();
     }
   }
 }
 
-int LayoutTableSection::CalcBlockDirectionOuterBorder(
-    BlockBorderSide side) const {
-  // TODO(wangxianzhu): There are several issues in this function:
-  // 1. Row borders are not respected;
-  // 2. Column borders should be ignored if this section is not at the top or
-  //    the bottom.
-  // 3. It's unnecessarily complex.
-  // I think we should just use cell's calculated collapsed border values to
-  // avoid all of the problems.
-  if (!grid_.size() || !Table()->NumEffectiveColumns())
-    return 0;
-
-  int border_width = 0;
-
-  const BorderValue& sb =
-      side == kBorderBefore ? Style()->BorderBefore() : Style()->BorderAfter();
-  if (sb.Style() == kBorderStyleHidden)
-    return -1;
-  if (sb.Style() > kBorderStyleHidden)
-    border_width = sb.Width();
-
-  const BorderValue& rb = side == kBorderBefore
-                              ? FirstRow()->Style()->BorderBefore()
-                              : LastRow()->Style()->BorderAfter();
-  if (rb.Style() == kBorderStyleHidden)
-    return -1;
-  if (rb.Style() > kBorderStyleHidden && rb.Width() > border_width)
-    border_width = rb.Width();
-
-  bool all_hidden = true;
-  unsigned r = side == kBorderBefore ? 0 : grid_.size() - 1;
-  unsigned n_cols = NumEffectiveColumns(r);
-  for (unsigned c = 0; c < n_cols; c++) {
-    const auto& grid_cell = GridCellAt(r, c);
-    if (grid_cell.InColSpan() || !grid_cell.HasCells())
-      continue;
-    const ComputedStyle& primary_cell_style =
-        grid_cell.PrimaryCell()->StyleRef();
-    // FIXME: Make this work with perpendicular and flipped cells.
-    const BorderValue& cb = side == kBorderBefore
-                                ? primary_cell_style.BorderBefore()
-                                : primary_cell_style.BorderAfter();
-    // FIXME: Don't repeat for the same col group
-    LayoutTableCol* col =
-        Table()->ColElementAtEffectiveColumn(c).InnermostColOrColGroup();
-    if (col) {
-      const BorderValue& gb = side == kBorderBefore
-                                  ? col->Style()->BorderBefore()
-                                  : col->Style()->BorderAfter();
-      if (gb.Style() == kBorderStyleHidden || cb.Style() == kBorderStyleHidden)
-        continue;
-      all_hidden = false;
-      if (gb.Style() > kBorderStyleHidden && gb.Width() > border_width)
-        border_width = gb.Width();
-      if (cb.Style() > kBorderStyleHidden && cb.Width() > border_width)
-        border_width = cb.Width();
-    } else {
-      if (cb.Style() == kBorderStyleHidden)
-        continue;
-      all_hidden = false;
-      if (cb.Style() > kBorderStyleHidden && cb.Width() > border_width)
-        border_width = cb.Width();
-    }
-  }
-  if (all_hidden)
-    return -1;
-
-  if (side == kBorderAfter)
-    border_width++;  // Distribute rounding error
-  return border_width / 2;
-}
-
-int LayoutTableSection::CalcInlineDirectionOuterBorder(
-    InlineBorderSide side) const {
-  unsigned total_cols = Table()->NumEffectiveColumns();
-  if (!grid_.size() || !total_cols)
-    return 0;
-  unsigned col_index = side == kBorderStart ? 0 : total_cols - 1;
-
-  int border_width = 0;
-
-  const BorderValue& sb =
-      side == kBorderStart ? Style()->BorderStart() : Style()->BorderEnd();
-  if (sb.Style() == kBorderStyleHidden)
-    return -1;
-  if (sb.Style() > kBorderStyleHidden)
-    border_width = sb.Width();
-
-  if (LayoutTableCol* col = Table()
-                                ->ColElementAtEffectiveColumn(col_index)
-                                .InnermostColOrColGroup()) {
-    const BorderValue& gb = side == kBorderStart ? col->Style()->BorderStart()
-                                                 : col->Style()->BorderEnd();
-    if (gb.Style() == kBorderStyleHidden)
-      return -1;
-    if (gb.Style() > kBorderStyleHidden && gb.Width() > border_width)
-      border_width = gb.Width();
-  }
-
-  bool all_hidden = true;
-  for (unsigned r = 0; r < grid_.size(); r++) {
-    if (col_index >= NumEffectiveColumns(r))
-      continue;
-    const auto& grid_cell = GridCellAt(r, col_index);
-    if (!grid_cell.HasCells())
-      continue;
-    // FIXME: Don't repeat for the same cell
-    const ComputedStyle& primary_cell_style =
-        grid_cell.PrimaryCell()->StyleRef();
-    const ComputedStyle& primary_cell_parent_style =
-        grid_cell.PrimaryCell()->Parent()->StyleRef();
-    // FIXME: Make this work with perpendicular and flipped cells.
-    const BorderValue& cb = side == kBorderStart
-                                ? primary_cell_style.BorderStart()
-                                : primary_cell_style.BorderEnd();
-    const BorderValue& rb = side == kBorderStart
-                                ? primary_cell_parent_style.BorderStart()
-                                : primary_cell_parent_style.BorderEnd();
-    if (cb.Style() == kBorderStyleHidden || rb.Style() == kBorderStyleHidden)
-      continue;
-    all_hidden = false;
-    if (cb.Style() > kBorderStyleHidden && cb.Width() > border_width)
-      border_width = cb.Width();
-    if (rb.Style() > kBorderStyleHidden && rb.Width() > border_width)
-      border_width = rb.Width();
-  }
-  if (all_hidden)
-    return -1;
-
-  if ((side == kBorderStart) != Table()->Style()->IsLeftToRightDirection())
-    border_width++;  // Distribute rounding error
-  return border_width / 2;
-}
-
-void LayoutTableSection::RecalcOuterBorder() {
-  outer_border_before_ = CalcBlockDirectionOuterBorder(kBorderBefore);
-  outer_border_after_ = CalcBlockDirectionOuterBorder(kBorderAfter);
-  outer_border_start_ = CalcInlineDirectionOuterBorder(kBorderStart);
-  outer_border_end_ = CalcInlineDirectionOuterBorder(kBorderEnd);
-}
-
 int LayoutTableSection::FirstLineBoxBaseline() const {
   if (!grid_.size())
     return -1;
 
   int first_line_baseline = grid_[0].baseline;
   if (first_line_baseline >= 0)
     return first_line_baseline + row_pos_[0];
 
   for (const auto& grid_cell : grid_[0].grid_cells) {
     if (const auto* cell = grid_cell.PrimaryCell()) {
@@ skipping 634 matching lines @@
 bool LayoutTableSection::PaintedOutputOfObjectHasNoEffectRegardlessOfSize()
     const {
   // LayoutTableSection paints background from columns.
   if (Table()->HasColElements())
     return false;
   return LayoutTableBoxComponent::
       PaintedOutputOfObjectHasNoEffectRegardlessOfSize();
 }
 
 }  // namespace blink