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

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

Issue 918703002: Re-add markForPaginationRelayoutIfNeeded() for all table children. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 | « LayoutTests/TestExpectations ('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, 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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 m_tableLayout->layout(); 453 m_tableLayout->layout();
454 454
455 LayoutUnit totalSectionLogicalHeight = 0; 455 LayoutUnit totalSectionLogicalHeight = 0;
456 LayoutUnit oldTableLogicalTop = 0; 456 LayoutUnit oldTableLogicalTop = 0;
457 for (unsigned i = 0; i < m_captions.size(); i++) 457 for (unsigned i = 0; i < m_captions.size(); i++)
458 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i] ->marginBefore() + m_captions[i]->marginAfter(); 458 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i] ->marginBefore() + m_captions[i]->marginAfter();
459 459
460 bool collapsing = collapseBorders(); 460 bool collapsing = collapseBorders();
461 461
462 for (LayoutObject* child = firstChild(); child; child = child->nextSibli ng()) { 462 for (LayoutObject* child = firstChild(); child; child = child->nextSibli ng()) {
463 if (!child->needsLayout() && child->isBox())
464 toRenderBox(child)->markForPaginationRelayoutIfNeeded(layouter);
463 if (child->isTableSection()) { 465 if (child->isTableSection()) {
464 LayoutTableSection* section = toLayoutTableSection(child); 466 LayoutTableSection* section = toLayoutTableSection(child);
465 if (m_columnLogicalWidthChanged) 467 if (m_columnLogicalWidthChanged)
466 layouter.setChildNeedsLayout(section); 468 layouter.setChildNeedsLayout(section);
467 section->layoutIfNeeded(); 469 section->layoutIfNeeded();
468 totalSectionLogicalHeight += section->calcRowLogicalHeight(); 470 totalSectionLogicalHeight += section->calcRowLogicalHeight();
469 if (collapsing) 471 if (collapsing)
470 section->recalcOuterBorder(); 472 section->recalcOuterBorder();
471 ASSERT(!section->needsLayout()); 473 ASSERT(!section->needsLayout());
472 } else if (child->isLayoutTableCol()) { 474 } else if (child->isLayoutTableCol()) {
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
1354 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const 1356 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const
1355 { 1357 {
1356 ASSERT(cell->isFirstOrLastCellInRow()); 1358 ASSERT(cell->isFirstOrLastCellInRow());
1357 if (hasSameDirectionAs(cell->row())) 1359 if (hasSameDirectionAs(cell->row()))
1358 return style()->borderEnd(); 1360 return style()->borderEnd();
1359 1361
1360 return style()->borderStart(); 1362 return style()->borderStart();
1361 } 1363 }
1362 1364
1363 } 1365 }
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698