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

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

Issue 2389913002: Use paginationStrut() instead of paginationStrutForRow() (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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/TableSectionPainter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights 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 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 // If the section is a repeating header group that allows at least one row of content then store the 612 // If the section is a repeating header group that allows at least one row of content then store the
613 // offset for other sections to offset their rows against. 613 // offset for other sections to offset their rows against.
614 if (isPaginated && m_head && m_head == section && 614 if (isPaginated && m_head && m_head == section &&
615 section->logicalHeight() < 615 section->logicalHeight() <
616 section->pageLogicalHeightForOffset(logicalOffset) && 616 section->pageLogicalHeightForOffset(logicalOffset) &&
617 section->getPaginationBreakability() != LayoutBox::AllowAnyBreaks) { 617 section->getPaginationBreakability() != LayoutBox::AllowAnyBreaks) {
618 LayoutUnit offsetForTableHeaders = state.heightOffsetForTableHeaders(); 618 LayoutUnit offsetForTableHeaders = state.heightOffsetForTableHeaders();
619 // Don't include any strut in the header group - we only want the height from its content. 619 // Don't include any strut in the header group - we only want the height from its content.
620 offsetForTableHeaders += section->logicalHeight(); 620 offsetForTableHeaders += section->logicalHeight();
621 if (LayoutTableRow* row = section->firstRow()) 621 if (LayoutTableRow* row = section->firstRow())
622 offsetForTableHeaders -= 622 offsetForTableHeaders -= row->paginationStrut();
623 section->paginationStrutForRow(row, section->logicalTop());
624 state.setHeightOffsetForTableHeaders(offsetForTableHeaders); 623 state.setHeightOffsetForTableHeaders(offsetForTableHeaders);
625 } 624 }
626 } 625 }
627 626
628 if (!topSection && computedLogicalHeight > totalSectionLogicalHeight && 627 if (!topSection && computedLogicalHeight > totalSectionLogicalHeight &&
629 !document().inQuirksMode()) { 628 !document().inQuirksMode()) {
630 // Completely empty tables (with no sections or anything) should at least honor specified height 629 // Completely empty tables (with no sections or anything) should at least honor specified height
631 // in strict mode. 630 // in strict mode.
632 setLogicalHeight(logicalHeight() + computedLogicalHeight); 631 setLogicalHeight(logicalHeight() + computedLogicalHeight);
633 } 632 }
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 } 1617 }
1619 1618
1620 LayoutUnit LayoutTable::paddingRight() const { 1619 LayoutUnit LayoutTable::paddingRight() const {
1621 if (collapseBorders()) 1620 if (collapseBorders())
1622 return LayoutUnit(); 1621 return LayoutUnit();
1623 1622
1624 return LayoutBlock::paddingRight(); 1623 return LayoutBlock::paddingRight();
1625 } 1624 }
1626 1625
1627 } // namespace blink 1626 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/TableSectionPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698