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

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 21 matching lines @@
 #include "core/layout/TableGridCell.h"
 #include "platform/wtf/Vector.h"
 
 namespace blink {
 
 // Helper class for paintObject.
 class CellSpan {
   STACK_ALLOCATED();
 
  public:
+  CellSpan() : start_(0), end_(0) {}
   CellSpan(unsigned start, unsigned end) : start_(start), end_(end) {}
 
   unsigned Start() const { return start_; }
-  unsigned end() const { return end_; }
+  unsigned End() const { return end_; }
 
   void DecreaseStart() { --start_; }
   void IncreaseEnd() { ++end_; }
 
   void EnsureConsistency(const unsigned);
 
  private:
   unsigned start_;
   unsigned end_;
 };
 
 inline bool operator==(const CellSpan& s1, const CellSpan& s2) {
-  return s1.Start() == s2.Start() && s1.end() == s2.end();
+  return s1.Start() == s2.Start() && s1.End() == s2.End();
 }
 inline bool operator!=(const CellSpan& s1, const CellSpan& s2) {
   return !(s1 == s2);
 }
 
 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
@@ skipping 184 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;
 
-  // Returns a row or column span covering all grid slots from each of which
-  // a primary cell intersecting |visualRect| originates.
-  CellSpan DirtiedRows(const LayoutRect& visual_rect) const;
-  CellSpan DirtiedEffectiveColumns(const LayoutRect& visual_rect) const;
+  // Sets |rows| and |columns| to cover all cells needing repaint in
+  // |damage_rect|.
+  void DirtiedRowsAndEffectiveColumns(const LayoutRect& damage_rect,
+                                      CellSpan& rows,
+                                      CellSpan& columns) const;
 
   const HashSet<const LayoutTableCell*>& OverflowingCells() const {
     return overflowing_cells_;
   }
   bool HasOverflowingCell() const {
     return overflowing_cells_.size() || force_full_paint_;
   }
   bool HasMultipleCellLevels() const { return has_multiple_cell_levels_; }
 
   const char* GetName() const override { return "LayoutTableSection"; }
@@ skipping 176 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