Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: third_party/WebKit/Source/core/paint/TableSectionPainter.cpp

Issue 2495343002: Revert of Paint collapsed borders of a table as one display item (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/paint/TableSectionPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp b/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp
index 0d17d0af4289bd5809e7e42ae69a0679e3f89e99..058af6bf3f89243b63c3ff2dcc480fc9950742fa 100644
--- a/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/TableSectionPainter.cpp
@@ -148,27 +148,24 @@
return elem1->absoluteColumnIndex() < elem2->absoluteColumnIndex();
}
-PaintResult TableSectionPainter::paintCollapsedBorders(
+void TableSectionPainter::paintCollapsedBorders(
const PaintInfo& paintInfo,
const LayoutPoint& paintOffset,
const CollapsedBorderValue& currentBorderValue) {
- PaintResult result =
- paintCollapsedSectionBorders(paintInfo, paintOffset, currentBorderValue);
+ paintCollapsedSectionBorders(paintInfo, paintOffset, currentBorderValue);
LayoutTable* table = m_layoutTableSection.table();
- if (table->header() == m_layoutTableSection) {
+ if (table->header() == m_layoutTableSection)
paintRepeatingHeaderGroup(paintInfo, paintOffset, currentBorderValue,
PaintCollapsedBorders);
- }
- return result;
-}
-
-PaintResult TableSectionPainter::paintCollapsedSectionBorders(
+}
+
+void TableSectionPainter::paintCollapsedSectionBorders(
const PaintInfo& paintInfo,
const LayoutPoint& paintOffset,
const CollapsedBorderValue& currentBorderValue) {
if (!m_layoutTableSection.numRows() ||
!m_layoutTableSection.table()->effectiveColumns().size())
- return FullyPainted;
+ return;
LayoutPoint adjustedPaintOffset =
paintOffset + m_layoutTableSection.location();
@@ -187,7 +184,7 @@
m_layoutTableSection.dirtiedEffectiveColumns(tableAlignedRect);
if (dirtiedColumns.start() >= dirtiedColumns.end())
- return MayBeClippedByPaintDirtyRect;
+ return;
// Collapsed borders are painted from the bottom right to the top left so that
// precedence due to cell position is respected.
@@ -209,11 +206,6 @@
currentBorderValue);
}
}
-
- if (dirtiedRows == m_layoutTableSection.fullTableRowSpan() &&
- dirtiedColumns == m_layoutTableSection.fullTableEffectiveColumnSpan())
- return FullyPainted;
- return MayBeClippedByPaintDirtyRect;
}
void TableSectionPainter::paintObject(const PaintInfo& paintInfo,

Powered by Google App Engine
This is Rietveld 408576698