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

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

Issue 2553653003: Make ifdefs consistent in WebKit/Source/core/layout/ . (Closed)
Patch Set: Update after review. Created 4 years 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. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
10 * 10 *
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 cell->logicalHeightForRowSizing() - baselinePosition); 822 cell->logicalHeightForRowSizing() - baselinePosition);
823 cellStartRowBaselineDescent = baselineDescent; 823 cellStartRowBaselineDescent = baselineDescent;
824 } 824 }
825 m_rowPos[row + 1] = 825 m_rowPos[row + 1] =
826 std::max<int>(m_rowPos[row + 1], m_rowPos[row] + m_grid[row].baseline + 826 std::max<int>(m_rowPos[row + 1], m_rowPos[row] + m_grid[row].baseline +
827 cellStartRowBaselineDescent); 827 cellStartRowBaselineDescent);
828 } 828 }
829 } 829 }
830 830
831 int LayoutTableSection::calcRowLogicalHeight() { 831 int LayoutTableSection::calcRowLogicalHeight() {
832 #if ENABLE(ASSERT) 832 #if DCHECK_IS_ON()
833 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this); 833 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
834 #endif 834 #endif
835 835
836 ASSERT(!needsLayout()); 836 ASSERT(!needsLayout());
837 837
838 LayoutTableCell* cell; 838 LayoutTableCell* cell;
839 839
840 // We may have to forcefully lay out cells here, in which case we need a 840 // We may have to forcefully lay out cells here, in which case we need a
841 // layout state. 841 // layout state.
842 LayoutState state(*this); 842 LayoutState state(*this);
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 1113
1114 static bool shouldFlexCellChild(LayoutObject* cellDescendant) { 1114 static bool shouldFlexCellChild(LayoutObject* cellDescendant) {
1115 return cellDescendant->isAtomicInlineLevel() || 1115 return cellDescendant->isAtomicInlineLevel() ||
1116 (cellDescendant->isBox() && 1116 (cellDescendant->isBox() &&
1117 toLayoutBox(cellDescendant)->style()->overflowY() != 1117 toLayoutBox(cellDescendant)->style()->overflowY() !=
1118 OverflowVisible && 1118 OverflowVisible &&
1119 toLayoutBox(cellDescendant)->style()->overflowY() != OverflowHidden); 1119 toLayoutBox(cellDescendant)->style()->overflowY() != OverflowHidden);
1120 } 1120 }
1121 1121
1122 void LayoutTableSection::layoutRows() { 1122 void LayoutTableSection::layoutRows() {
1123 #if ENABLE(ASSERT) 1123 #if DCHECK_IS_ON()
1124 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this); 1124 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this);
1125 #endif 1125 #endif
1126 1126
1127 ASSERT(!needsLayout()); 1127 ASSERT(!needsLayout());
1128 1128
1129 LayoutAnalyzer::Scope analyzer(*this); 1129 LayoutAnalyzer::Scope analyzer(*this);
1130 1130
1131 // FIXME: Changing the height without a layout can change the overflow so it 1131 // FIXME: Changing the height without a layout can change the overflow so it
1132 // seems wrong. 1132 // seems wrong.
1133 1133
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
2077 // the header in all columns. 2077 // the header in all columns.
2078 // Note that this is in flow thread coordinates, not visual coordinates. The 2078 // Note that this is in flow thread coordinates, not visual coordinates. The
2079 // enclosing LayoutFlowThread will convert to visual coordinates. 2079 // enclosing LayoutFlowThread will convert to visual coordinates.
2080 if (table()->header() == this && isRepeatingHeaderGroup()) 2080 if (table()->header() == this && isRepeatingHeaderGroup())
2081 rect.setHeight(table()->logicalHeight()); 2081 rect.setHeight(table()->logicalHeight());
2082 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect, 2082 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect,
2083 flags); 2083 flags);
2084 } 2084 }
2085 2085
2086 } // namespace blink 2086 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutObject.cpp ('k') | third_party/WebKit/Source/core/layout/SubtreeLayoutScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698