Separate backgroundObscurationStatus and hasBoxDecorationBackground

third_party/WebKit/Source/core/paint/TableSectionPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/TableSectionPainter.h"
 
 #include "core/layout/LayoutTableCell.h"
 #include "core/layout/LayoutTableCol.h"
 #include "core/layout/LayoutTableRow.h"
 #include "core/paint/BoxClipper.h"
@@ skipping 171 matching lines @@
 
     if (shouldPaintDescendantBlockBackgrounds(paintInfo.phase)) {
         for (unsigned r = dirtiedRows.start(); r < dirtiedRows.end(); r++) {
             const LayoutTableRow* row = m_layoutTableSection.rowLayoutObjectAt(r);
             // If a row has a layer, we'll paint row background in TableRowPainter.
             if (!row || row->hasSelfPaintingLayer())
                 continue;
 
             TableRowPainter rowPainter(*row);
             rowPainter.paintBoxShadow(paintInfoForDescendants, paintOffset, Normal);
-            if (row->hasBackground()) {
+            if (row->styleRef().hasBackground()) {
                 for (unsigned c = dirtiedColumns.start(); c < dirtiedColumns.end(); c++) {
                     if (const LayoutTableCell* cell = primaryCellToPaint(r, c, dirtiedRows, dirtiedColumns))
                         rowPainter.paintBackgroundBehindCell(*cell, paintInfoForDescendants, paintOffset);
                 }
             }
             rowPainter.paintBoxShadow(paintInfoForDescendants, paintOffset, Inset);
         }
     }
 
     const HashSet<LayoutTableCell*>& overflowingCells = m_layoutTableSection.overflowingCells();
@@ skipping 57 matching lines @@
     LayoutTable::ColAndColGroup colAndColGroup = m_layoutTableSection.table()->colElementAtAbsoluteColumn(cell.absoluteColumnIndex());
     LayoutTableCol* column = colAndColGroup.col;
     LayoutTableCol* columnGroup = colAndColGroup.colgroup;
     TableCellPainter tableCellPainter(cell);
 
     // Column groups and columns first.
     // FIXME: Columns and column groups do not currently support opacity, and they are being painted "too late" in
     // the stack, since we have already opened a transparency layer (potentially) for the table row group.
     // Note that we deliberately ignore whether or not the cell has a layer, since these backgrounds paint "behind" the
     // cell.
-    if (columnGroup && columnGroup->hasBackground())
+    if (columnGroup && columnGroup->styleRef().hasBackground())
         tableCellPainter.paintContainerBackgroundBehindCell(paintInfoForCells, cellPoint, *columnGroup, DisplayItem::TableCellBackgroundFromColumnGroup);
-    if (column && column->hasBackground())
+    if (column && column->styleRef().hasBackground())
         tableCellPainter.paintContainerBackgroundBehindCell(paintInfoForCells, cellPoint, *column, DisplayItem::TableCellBackgroundFromColumn);
 
     // Paint the row group next.
-    if (m_layoutTableSection.hasBackground())
+    if (m_layoutTableSection.styleRef().hasBackground())
         tableCellPainter.paintContainerBackgroundBehindCell(paintInfoForCells, cellPoint, m_layoutTableSection, DisplayItem::TableCellBackgroundFromSection);
 }
 
 void TableSectionPainter::paintCell(const LayoutTableCell& cell, const PaintInfo& paintInfoForCells, const LayoutPoint& paintOffset)
 {
     if (!cell.hasSelfPaintingLayer() && !cell.row()->hasSelfPaintingLayer()) {
         LayoutPoint cellPoint = m_layoutTableSection.flipForWritingModeForChild(&cell, paintOffset);
         cell.paint(paintInfoForCells, cellPoint);
     }
 }
 
 void TableSectionPainter::paintBoxShadow(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, ShadowStyle shadowStyle)
 {
     DCHECK(shouldPaintSelfBlockBackground(paintInfo.phase));
     if (!m_layoutTableSection.styleRef().boxShadow())
         return;
 
     DisplayItem::Type type = shadowStyle == Normal ? DisplayItem::TableSectionBoxShadowNormal : DisplayItem::TableSectionBoxShadowInset;
     if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_layoutTableSection, type))
         return;
 
     LayoutRect bounds = BoxPainter(m_layoutTableSection).boundsForDrawingRecorder(paintOffset);
     LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableSection, type, bounds);
     BoxPainter::paintBoxShadow(paintInfo, LayoutRect(paintOffset, m_layoutTableSection.size()), m_layoutTableSection.styleRef(), shadowStyle);
 }
 
 } // namespace blink