Revert of Paint collapsed borders of a table as one display item

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 39 matching lines @@
   void decreaseStart() { --m_start; }
   void increaseEnd() { ++m_end; }
 
   void ensureConsistency(const unsigned);
 
  private:
   unsigned m_start;
   unsigned m_end;
 };
 
-inline bool operator==(const CellSpan& a, const CellSpan& b) {
-  return a.start() == b.start() && a.end() == b.end();
-}
-inline bool operator!=(const CellSpan& a, const CellSpan& b) {
-  return !(a == b);
-}
-
 class LayoutTableCell;
 class LayoutTableRow;
 
 // LayoutTableSection is used to represent table row group (display:
 // table-row-group), header group (display: table-header-group) and footer group
 // (display: table-footer-group).
 //
 // The object holds the internal representation of the rows (m_grid). See
 // recalcCells() below for some extra explanation.
 //
@@ skipping 219 matching lines @@
       const LayoutObject* parent) const override {
     return createAnonymousWithParent(parent);
   }
 
   void paint(const PaintInfo&, const LayoutPoint&) const override;
 
   // Flip the rect so it aligns with the coordinates used by the rowPos and
   // columnPos vectors.
   LayoutRect logicalRectForWritingModeAndDirection(const LayoutRect&) const;
 
-  CellSpan fullTableRowSpan() const { return CellSpan(0, m_grid.size()); }
-  CellSpan fullTableEffectiveColumnSpan() const {
-    return CellSpan(0, table()->numEffectiveColumns());
-  }
   CellSpan dirtiedRows(const LayoutRect& visualRect) const;
   CellSpan dirtiedEffectiveColumns(const LayoutRect& visualRect) const;
-
   const HashSet<LayoutTableCell*>& overflowingCells() const {
     return m_overflowingCells;
   }
   bool hasMultipleCellLevels() const { return m_hasMultipleCellLevels; }
 
   const char* name() const override { return "LayoutTableSection"; }
 
   // Whether a section has opaque background depends on many factors, e.g.
   // border spacing, border collapsing, missing cells, etc. For simplicity,
   // just conservatively assume all table sections are not opaque.
@@ skipping 83 matching lines @@
   void updateBaselineForCell(LayoutTableCell*,
                              unsigned row,
                              int& baselineDescent);
 
   bool hasOverflowingCell() const {
     return m_overflowingCells.size() || m_forceSlowPaintPathWithOverflowingCell;
   }
 
   void computeOverflowFromCells(unsigned totalRows, unsigned nEffCols);
 
+  CellSpan fullTableRowSpan() const { return CellSpan(0, m_grid.size()); }
+  CellSpan fullTableEffectiveColumnSpan() const {
+    return CellSpan(0, table()->numEffectiveColumns());
+  }
+
   // These two functions take a rectangle as input that has been flipped by
   // logicalRectForWritingModeAndDirection.
   // The returned span of rows or columns is end-exclusive, and empty if
   // start==end.
   CellSpan spannedRows(const LayoutRect& flippedRect) const;
   CellSpan spannedEffectiveColumns(const LayoutRect& flippedRect) const;
 
   void setLogicalPositionForCell(LayoutTableCell*,
                                  unsigned effectiveColumn) const;
 
@@ skipping 53 matching lines @@
   bool m_hasMultipleCellLevels;
 
   LayoutUnit m_offsetForRepeatingHeader;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableSection, isTableSection());
 
 }  // namespace blink
 
 #endif  // LayoutTableSection_h