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

Side by Side Diff: Source/core/rendering/RenderTable.cpp

Issue 194713009: Make sure table cells are laid out again when fragmentainer height changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address code review issues raised together with the lgtm. Created 6 years, 9 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 | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderTableRow.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 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 m_tableLayout->layout(); 451 m_tableLayout->layout();
452 452
453 LayoutUnit totalSectionLogicalHeight = 0; 453 LayoutUnit totalSectionLogicalHeight = 0;
454 LayoutUnit oldTableLogicalTop = 0; 454 LayoutUnit oldTableLogicalTop = 0;
455 for (unsigned i = 0; i < m_captions.size(); i++) 455 for (unsigned i = 0; i < m_captions.size(); i++)
456 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i]->ma rginBefore() + m_captions[i]->marginAfter(); 456 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i]->ma rginBefore() + m_captions[i]->marginAfter();
457 457
458 bool collapsing = collapseBorders(); 458 bool collapsing = collapseBorders();
459 459
460 for (RenderObject* child = firstChild(); child; child = child->nextSibling() ) { 460 for (RenderObject* child = firstChild(); child; child = child->nextSibling() ) {
461 if (!child->needsLayout() && child->isBox())
462 toRenderBox(child)->markForPaginationRelayoutIfNeeded(layouter);
461 if (child->isTableSection()) { 463 if (child->isTableSection()) {
462 RenderTableSection* section = toRenderTableSection(child); 464 RenderTableSection* section = toRenderTableSection(child);
463 if (m_columnLogicalWidthChanged) 465 if (m_columnLogicalWidthChanged)
464 layouter.setChildNeedsLayout(section); 466 layouter.setChildNeedsLayout(section);
465 section->layoutIfNeeded(); 467 section->layoutIfNeeded();
466 totalSectionLogicalHeight += section->calcRowLogicalHeight(); 468 totalSectionLogicalHeight += section->calcRowLogicalHeight();
467 if (collapsing) 469 if (collapsing)
468 section->recalcOuterBorder(); 470 section->recalcOuterBorder();
469 ASSERT(!section->needsLayout()); 471 ASSERT(!section->needsLayout());
470 } else if (child->isRenderTableCol()) { 472 } else if (child->isRenderTableCol()) {
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1460 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1459 { 1461 {
1460 ASSERT(cell->isFirstOrLastCellInRow()); 1462 ASSERT(cell->isFirstOrLastCellInRow());
1461 if (hasSameDirectionAs(cell->row())) 1463 if (hasSameDirectionAs(cell->row()))
1462 return style()->borderEnd(); 1464 return style()->borderEnd();
1463 1465
1464 return style()->borderStart(); 1466 return style()->borderStart();
1465 } 1467 }
1466 1468
1467 } 1469 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderTableRow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698