Allow assertions to be enabled in Blink Release builds.

Source/core/rendering/RenderTableSection.cpp

 /*
  * 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, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 614 matching lines @@
         if (cell->rowSpan() == 1) {
             baselineDescent = std::max(baselineDescent, cell->logicalHeightForRowSizing() - baselinePosition);
             cellStartRowBaselineDescent = baselineDescent;
         }
         m_rowPos[row + 1] = std::max<int>(m_rowPos[row + 1], m_rowPos[row] + m_grid[row].baseline + cellStartRowBaselineDescent);
     }
 }
 
 int RenderTableSection::calcRowLogicalHeight()
 {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
 #endif
 
     ASSERT(!needsLayout());
 
     RenderTableCell* cell;
 
     // FIXME: This shouldn't use the same constructor as RenderView.
     LayoutState state(*this);
 
     m_rowPos.resize(m_grid.size() + 1);
 
     // We ignore the border-spacing on any non-top section as it is already included in the previous section's last row position.
     if (this == table()->topSection())
         m_rowPos[0] = table()->vBorderSpacing();
     else
         m_rowPos[0] = 0;
 
     SpanningRenderTableCells rowSpanCells;
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     HashSet<const RenderTableCell*> uniqueCells;
 #endif
 
     for (unsigned r = 0; r < m_grid.size(); r++) {
         m_grid[r].baseline = 0;
         LayoutUnit baselineDescent = 0;
 
         // Our base size is the biggest logical height from our cells' styles (excluding row spanning cells).
         m_rowPos[r + 1] = std::max(m_rowPos[r] + minimumValueForLength(m_grid[r].logicalHeight, 0).round(), 0);
 
         Row& row = m_grid[r].row;
         unsigned totalCols = row.size();
         RenderTableCell* lastRowSpanCell = 0;
 
         for (unsigned c = 0; c < totalCols; c++) {
             CellStruct& current = cellAt(r, c);
             for (unsigned i = 0; i < current.cells.size(); i++) {
                 cell = current.cells[i];
                 if (current.inColSpan && cell->rowSpan() == 1)
                     continue;
 
                 if (cell->rowSpan() > 1) {
                     // For row spanning cells, we only handle them for the first row they span. This ensures we take their baseline into account.
                     if (lastRowSpanCell != cell && cell->rowIndex() == r) {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
                         ASSERT(!uniqueCells.contains(cell));
                         uniqueCells.add(cell);
 #endif
 
                         rowSpanCells.append(cell);
                         lastRowSpanCell = cell;
 
                         // Find out the baseline. The baseline is set on the first row in a rowSpan.
                         updateBaselineForCell(cell, r, baselineDescent);
                     }
@@ skipping 169 matching lines @@
     return extraLogicalHeight - remainingExtraLogicalHeight;
 }
 
 static bool shouldFlexCellChild(RenderObject* cellDescendant)
 {
     return cellDescendant->isReplaced() || (cellDescendant->isBox() && toRenderBox(cellDescendant)->scrollsOverflow());
 }
 
 void RenderTableSection::layoutRows()
 {
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
 #endif
 
     ASSERT(!needsLayout());
 
     // FIXME: Changing the height without a layout can change the overflow so it seems wrong.
 
     unsigned totalRows = m_grid.size();
 
     // Set the width of our section now.  The rows will also be this width.
@@ skipping 142 matching lines @@
     unsigned totalRows = m_grid.size();
     unsigned nEffCols = table()->numEffCols();
     computeOverflowFromCells(totalRows, nEffCols);
 }
 
 void RenderTableSection::computeOverflowFromCells(unsigned totalRows, unsigned nEffCols)
 {
     unsigned totalCellsCount = nEffCols * totalRows;
     unsigned maxAllowedOverflowingCellsCount = totalCellsCount < gMinTableSizeToUseFastPaintPathWithOverflowingCell ? 0 : gMaxAllowedOverflowingCellRatioForFastPaintPath * totalCellsCount;
 
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
     bool hasOverflowingCell = false;
 #endif
     // Now that our height has been determined, add in overflow from cells.
     for (unsigned r = 0; r < totalRows; r++) {
         for (unsigned c = 0; c < nEffCols; c++) {
             CellStruct& cs = cellAt(r, c);
             RenderTableCell* cell = cs.primaryCell();
             if (!cell || cs.inColSpan)
                 continue;
             if (r < totalRows - 1 && cell == primaryCellAt(r + 1, c))
                 continue;
             addOverflowFromChild(cell);
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
             hasOverflowingCell |= cell->hasVisualOverflow();
 #endif
             if (cell->hasVisualOverflow() && !m_forceSlowPaintPathWithOverflowingCell) {
                 m_overflowingCells.add(cell);
                 if (m_overflowingCells.size() > maxAllowedOverflowingCellsCount) {
                     // We need to set m_forcesSlowPaintPath only if there is a least one overflowing cells as the hit testing code rely on this information.
                     m_forceSlowPaintPathWithOverflowingCell = true;
                     // The slow path does not make any use of the overflowing cells info, don't hold on to the memory.
                     m_overflowingCells.clear();
                 }
@@ skipping 353 matching lines @@
                         CellStruct& current = cellAt(r, c);
                         RenderTableCell* cell = current.primaryCell();
                         if (!cell || (r > dirtiedRows.start() && primaryCellAt(r - 1, c) == cell) || (c > dirtiedColumns.start() && primaryCellAt(r, c - 1) == cell))
                             continue;
                         paintCell(cell, paintInfo, paintOffset);
                     }
                 }
             }
         } else {
             // The overflowing cells should be scarce to avoid adding a lot of cells to the HashSet.
-#ifndef NDEBUG
+#if ENABLE(ASSERT)
             unsigned totalRows = m_grid.size();
             unsigned totalCols = table()->columns().size();
             ASSERT(m_overflowingCells.size() < totalRows * totalCols * gMaxAllowedOverflowingCellRatioForFastPaintPath);
 #endif
 
             // To make sure we properly repaint the section, we repaint all the overflowing cells that we collected.
             Vector<RenderTableCell*> cells;
             copyToVector(m_overflowingCells, cells);
 
             HashSet<RenderTableCell*> spanningCells;
@@ skipping 274 matching lines @@
     // FIXME: The table's direction should determine our row's direction, not the section's (see bug 96691).
     if (!style()->isLeftToRightDirection())
         cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - table()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] + horizontalBorderSpacing);
     else
         cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizontalBorderSpacing);
 
     cell->setLogicalLocation(cellLocation);
 }
 
 } // namespace WebCore