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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTableSection.cpp

Issue 2394683005: Remove ASSERT_UNUSED (Closed)
Patch Set: Created 4 years, 2 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All r ights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 LayoutTableCell* cell, 598 LayoutTableCell* cell,
599 struct SpanningRowsHeight& spanningRowsHeight, 599 struct SpanningRowsHeight& spanningRowsHeight,
600 unsigned& extraHeightToPropagate, 600 unsigned& extraHeightToPropagate,
601 Vector<int>& rowsCountWithOnlySpanningCells) { 601 Vector<int>& rowsCountWithOnlySpanningCells) {
602 ASSERT(spanningRowsHeight.rowHeight.size()); 602 ASSERT(spanningRowsHeight.rowHeight.size());
603 603
604 int accumulatedPositionIncrease = 0; 604 int accumulatedPositionIncrease = 0;
605 const unsigned rowSpan = cell->rowSpan(); 605 const unsigned rowSpan = cell->rowSpan();
606 const unsigned rowIndex = cell->rowIndex(); 606 const unsigned rowIndex = cell->rowIndex();
607 607
608 ASSERT_UNUSED(rowSpan, rowSpan == spanningRowsHeight.rowHeight.size()); 608 DCHECK_EQ(rowSpan, spanningRowsHeight.rowHeight.size());
609 609
610 for (unsigned row = 0; row < spanningRowsHeight.rowHeight.size(); row++) { 610 for (unsigned row = 0; row < spanningRowsHeight.rowHeight.size(); row++) {
611 unsigned actualRow = row + rowIndex; 611 unsigned actualRow = row + rowIndex;
612 if (!spanningRowsHeight.rowHeight[row] && 612 if (!spanningRowsHeight.rowHeight[row] &&
613 rowHasOnlySpanningCells(actualRow)) { 613 rowHasOnlySpanningCells(actualRow)) {
614 spanningRowsHeight.rowHeight[row] = calcRowHeightHavingOnlySpanningCells( 614 spanningRowsHeight.rowHeight[row] = calcRowHeightHavingOnlySpanningCells(
615 actualRow, accumulatedPositionIncrease, rowIndex + rowSpan, 615 actualRow, accumulatedPositionIncrease, rowIndex + rowSpan,
616 extraHeightToPropagate, rowsCountWithOnlySpanningCells); 616 extraHeightToPropagate, rowsCountWithOnlySpanningCells);
617 accumulatedPositionIncrease += spanningRowsHeight.rowHeight[row]; 617 accumulatedPositionIncrease += spanningRowsHeight.rowHeight[row];
618 } 618 }
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1952 // Repeating table headers are painted once per fragmentation page/column. Thi s does not go through the regular fragmentation machinery, 1952 // Repeating table headers are painted once per fragmentation page/column. Thi s does not go through the regular fragmentation machinery,
1953 // so we need special code to expand the invalidation rect to contain all posi tions of the header in all columns. 1953 // so we need special code to expand the invalidation rect to contain all posi tions of the header in all columns.
1954 // Note that this is in flow thread coordinates, not visual coordinates. The e nclosing LayoutFlowThread will convert to visual coordinates. 1954 // Note that this is in flow thread coordinates, not visual coordinates. The e nclosing LayoutFlowThread will convert to visual coordinates.
1955 if (table()->header() == this && isRepeatingHeaderGroup()) 1955 if (table()->header() == this && isRepeatingHeaderGroup())
1956 rect.setHeight(table()->logicalHeight()); 1956 rect.setHeight(table()->logicalHeight());
1957 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect, 1957 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect,
1958 flags); 1958 flags);
1959 } 1959 }
1960 1960
1961 } // namespace blink 1961 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698