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

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

Issue 2368843002: Make sure there's a table header before attempting to account for its offset (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 | « third_party/WebKit/LayoutTests/fragmentation/no-repeating-thead-no-crash-expected.txt ('k') | no next file » | 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, 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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 if (rowLayoutObject) { 986 if (rowLayoutObject) {
987 rowLayoutObject->setLocation(LayoutPoint(0, m_rowPos[r])); 987 rowLayoutObject->setLocation(LayoutPoint(0, m_rowPos[r]));
988 rowLayoutObject->setLogicalWidth(logicalWidth()); 988 rowLayoutObject->setLogicalWidth(logicalWidth());
989 rowLayoutObject->setLogicalHeight(LayoutUnit(m_rowPos[r + 1] - m_row Pos[r] - vspacing)); 989 rowLayoutObject->setLogicalHeight(LayoutUnit(m_rowPos[r + 1] - m_row Pos[r] - vspacing));
990 rowLayoutObject->updateLayerTransformAfterLayout(); 990 rowLayoutObject->updateLayerTransformAfterLayout();
991 if (isPaginated) { 991 if (isPaginated) {
992 paginationStrutOnRow = paginationStrutForRow(rowLayoutObject, La youtUnit(m_rowPos[r])); 992 paginationStrutOnRow = paginationStrutForRow(rowLayoutObject, La youtUnit(m_rowPos[r]));
993 if (paginationStrutOnRow) { 993 if (paginationStrutOnRow) {
994 // If there isn't room for at least one content row on a pag e with a header group, then 994 // If there isn't room for at least one content row on a pag e with a header group, then
995 // we won't repeat the header on each page. 995 // we won't repeat the header on each page.
996 if (r == 0 && table()->sectionAbove(this) == table()->header ()) 996 if (!r && table()->header() && table()->sectionAbove(this) = = table()->header())
997 state.setHeightOffsetForTableHeaders(state.heightOffsetF orTableHeaders() - table()->header()->logicalHeight()); 997 state.setHeightOffsetForTableHeaders(state.heightOffsetF orTableHeaders() - table()->header()->logicalHeight());
998 // If we have a header group we will paint it at the top of each page, move the rows 998 // If we have a header group we will paint it at the top of each page, move the rows
999 // down to accomodate it. 999 // down to accomodate it.
1000 paginationStrutOnRow += state.heightOffsetForTableHeaders(). toInt(); 1000 paginationStrutOnRow += state.heightOffsetForTableHeaders(). toInt();
1001 for (unsigned rowIndex = r; rowIndex <= totalRows; rowIndex+ +) 1001 for (unsigned rowIndex = r; rowIndex <= totalRows; rowIndex+ +)
1002 m_rowPos[rowIndex] += paginationStrutOnRow; 1002 m_rowPos[rowIndex] += paginationStrutOnRow;
1003 } 1003 }
1004 } 1004 }
1005 } 1005 }
1006 1006
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 // Repeating table headers are painted once per fragmentation page/column. T his does not go through the regular fragmentation machinery, 1724 // Repeating table headers are painted once per fragmentation page/column. T his does not go through the regular fragmentation machinery,
1725 // so we need special code to expand the invalidation rect to contain all po sitions of the header in all columns. 1725 // so we need special code to expand the invalidation rect to contain all po sitions of the header in all columns.
1726 // Note that this is in flow thread coordinates, not visual coordinates. The enclosing LayoutFlowThread will convert to visual coordinates. 1726 // Note that this is in flow thread coordinates, not visual coordinates. The enclosing LayoutFlowThread will convert to visual coordinates.
1727 if (table()->header() == this && hasRepeatingHeaderGroup()) 1727 if (table()->header() == this && hasRepeatingHeaderGroup())
1728 rect.setHeight(table()->logicalHeight()); 1728 rect.setHeight(table()->logicalHeight());
1729 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rec t, flags); 1729 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rec t, flags);
1730 } 1730 }
1731 1731
1732 1732
1733 } // namespace blink 1733 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fragmentation/no-repeating-thead-no-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698