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

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

Issue 2529073002: No longer store page logical height in LayoutState. (Closed)
Patch Set: 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, 2007, 2008, 2009, 2010, 2013 Apple Inc. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 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 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 layoutPositionedObjects(dimensionChanged); 730 layoutPositionedObjects(dimensionChanged);
731 731
732 updateLayerTransformAfterLayout(); 732 updateLayerTransformAfterLayout();
733 733
734 // Layout was changed, so probably borders too. 734 // Layout was changed, so probably borders too.
735 invalidateCollapsedBorders(); 735 invalidateCollapsedBorders();
736 736
737 computeOverflow(clientLogicalBottom()); 737 computeOverflow(clientLogicalBottom());
738 updateAfterLayout(); 738 updateAfterLayout();
739 739
740 if (state.pageLogicalHeight()) { 740 if (state.isPaginated() && isPageLogicalHeightKnown()) {
741 m_blockOffsetToFirstRepeatableHeader = state.pageLogicalOffset( 741 m_blockOffsetToFirstRepeatableHeader = state.pageLogicalOffset(
742 *this, topSection ? topSection->logicalTop() : LayoutUnit()); 742 *this, topSection ? topSection->logicalTop() : LayoutUnit());
743 } 743 }
744 } 744 }
745 745
746 // FIXME: This value isn't the intrinsic content logical height, but we need 746 // FIXME: This value isn't the intrinsic content logical height, but we need
747 // to update the value as its used by flexbox layout. crbug.com/367324 747 // to update the value as its used by flexbox layout. crbug.com/367324
748 setIntrinsicContentLogicalHeight(contentLogicalHeight()); 748 setIntrinsicContentLogicalHeight(contentLogicalHeight());
749 749
750 m_columnLogicalWidthChanged = false; 750 m_columnLogicalWidthChanged = false;
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1696 } 1696 }
1697 1697
1698 LayoutUnit LayoutTable::paddingRight() const { 1698 LayoutUnit LayoutTable::paddingRight() const {
1699 if (collapseBorders()) 1699 if (collapseBorders())
1700 return LayoutUnit(); 1700 return LayoutUnit();
1701 1701
1702 return LayoutBlock::paddingRight(); 1702 return LayoutBlock::paddingRight();
1703 } 1703 }
1704 1704
1705 } // namespace blink 1705 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutState.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698