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

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

Issue 804383002: Layout captions in simplifiedNormalFlowLayout for tables. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 if (RenderTableSection* section = firstBody()) 380 if (RenderTableSection* section = firstBody())
381 extraLogicalHeight -= section->distributeExtraLogicalHeightToRows(extraL ogicalHeight); 381 extraLogicalHeight -= section->distributeExtraLogicalHeightToRows(extraL ogicalHeight);
382 382
383 // FIXME: We really would like to enable this ASSERT to ensure that all the extra space has been distributed. 383 // FIXME: We really would like to enable this ASSERT to ensure that all the extra space has been distributed.
384 // However our current distribution algorithm does not round properly and th us we can have some remaining height. 384 // However our current distribution algorithm does not round properly and th us we can have some remaining height.
385 // ASSERT(!topSection() || !extraLogicalHeight); 385 // ASSERT(!topSection() || !extraLogicalHeight);
386 } 386 }
387 387
388 void RenderTable::simplifiedNormalFlowLayout() 388 void RenderTable::simplifiedNormalFlowLayout()
389 { 389 {
390 for (auto& caption : m_captions)
mstensho (USE GERRIT) 2014/12/16 15:27:01 It may not matter much (since I assume and really
dsinclair 2014/12/16 15:40:32 Filed crbug.com/442737 and added a comment. I'd li
mstensho (USE GERRIT) 2014/12/16 15:43:31 Acknowledged.
Julien - ping for review 2014/12/16 16:05:53 Captions needs to be laid out first so that we can
dsinclair 2014/12/16 17:23:18 So, you think this should be removed? Or should we
mstensho (USE GERRIT) 2014/12/16 20:37:07 Isn't it normally the parent that positions the ch
391 caption->layoutIfNeeded();
392
390 for (RenderTableSection* section = topSection(); section; section = sectionB elow(section)) { 393 for (RenderTableSection* section = topSection(); section; section = sectionB elow(section)) {
391 section->layoutIfNeeded(); 394 section->layoutIfNeeded();
392 section->computeOverflowFromCells(); 395 section->computeOverflowFromCells();
393 } 396 }
394 } 397 }
395 398
396 void RenderTable::layout() 399 void RenderTable::layout()
397 { 400 {
398 ASSERT(needsLayout()); 401 ASSERT(needsLayout());
399 402
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1340 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1338 { 1341 {
1339 ASSERT(cell->isFirstOrLastCellInRow()); 1342 ASSERT(cell->isFirstOrLastCellInRow());
1340 if (hasSameDirectionAs(cell->row())) 1343 if (hasSameDirectionAs(cell->row()))
1341 return style()->borderEnd(); 1344 return style()->borderEnd();
1342 1345
1343 return style()->borderStart(); 1346 return style()->borderStart();
1344 } 1347 }
1345 1348
1346 } 1349 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698