Fix Border collapsing with colpsan / rowspan cells

third_party/WebKit/Source/core/layout/LayoutTableSection.h

 /*
  * 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, 2009, 2013 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 323 matching lines @@
   // border spacing, border collapsing, missing cells, etc. For simplicity,
   // just conservatively assume all table sections are not opaque.
   bool ForegroundIsKnownToBeOpaqueInRect(const LayoutRect&,
                                          unsigned) const override {
     return false;
   }
   bool BackgroundIsKnownToBeOpaqueInRect(const LayoutRect&) const override {
     return false;
   }
 
+  // Returns cell's position before any transformations are applied.
+  LayoutRect GetCellPosition(unsigned row, unsigned effective_column) const;
+  // Returns cell's position after transforms.
+  LayoutRect GetCellPhysicalPosition(unsigned row,
+                                     unsigned effective_column) const;
+
   int PaginationStrutForRow(LayoutTableRow*, LayoutUnit logical_offset) const;
 
   bool MapToVisualRectInAncestorSpaceInternal(
       const LayoutBoxModelObject* ancestor,
       TransformState&,
       VisualRectFlags = kDefaultVisualRectFlags) const override;
 
   bool IsRepeatingHeaderGroup() const;
 
   void UpdateLayout() override;
 
   CellSpan FullSectionRowSpan() const { return CellSpan(0, grid_.size()); }
   CellSpan FullTableEffectiveColumnSpan() const {
     return CellSpan(0, Table()->NumEffectiveColumns());
   }
 
+  // Collapsed borders are painted by the section
+  bool PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const override {
+    return false;
+  }
+
  protected:
   void StyleDidChange(StyleDifference, const ComputedStyle* old_style) override;
   bool NodeAtPoint(HitTestResult&,
                    const HitTestLocation& location_in_container,
                    const LayoutPoint& accumulated_offset,
                    HitTestAction) override;
 
  private:
   bool IsOfType(LayoutObjectType type) const override {
     return type == kLayoutObjectTableSection || LayoutBox::IsOfType(type);
@@ skipping 74 matching lines @@
                                  unsigned effective_column) const;
 
   void RelayoutCellIfFlexed(LayoutTableCell&, int row_index, int row_height);
 
   int LogicalHeightForRow(const LayoutTableRow&) const;
 
   // Honor breaking restrictions inside the table row, and adjust position and
   // size accordingly.
   void AdjustRowForPagination(LayoutTableRow&, SubtreeLayoutScope&);
 
-  bool PaintedOutputOfObjectHasNoEffectRegardlessOfSize() const override;
+  LayoutRect TransformLogicalToPhysicalPosition(
+      const LayoutRect& position) const;
 
   // The representation of the rows and their cells (CellStruct).
   Vector<RowStruct> grid_;
 
   // The logical offset of each row from the top of the section.
   //
   // Note that this Vector has one more entry than the number of rows so that
   // we can keep track of the final size of the section. That is,
   // m_rowPos[m_grid.size()] is a valid entry.
   //
@@ skipping 37 matching lines @@
 
   // Whether any cell spans multiple rows or cols.
   bool has_spanning_cells_;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableSection, IsTableSection());
 
 }  // namespace blink
 
 #endif  // LayoutTableSection_h