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

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

Issue 1360753002: Only block container children support pagination struts. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: code review Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 { 365 {
366 if (caption.needsLayout()) { 366 if (caption.needsLayout()) {
367 // The margins may not be available but ensure the caption is at least l ocated beneath any previous sibling caption 367 // The margins may not be available but ensure the caption is at least l ocated beneath any previous sibling caption
368 // so that it does not mistakenly think any floats in the previous capti on intrude into it. 368 // so that it does not mistakenly think any floats in the previous capti on intrude into it.
369 caption.setLogicalLocation(LayoutPoint(caption.marginStart(), collapsedM arginBeforeForChild(caption) + logicalHeight())); 369 caption.setLogicalLocation(LayoutPoint(caption.marginStart(), collapsedM arginBeforeForChild(caption) + logicalHeight()));
370 // If LayoutTableCaption ever gets a layout() function, use it here. 370 // If LayoutTableCaption ever gets a layout() function, use it here.
371 caption.layoutIfNeeded(); 371 caption.layoutIfNeeded();
372 } 372 }
373 // Apply the margins to the location now that they are definitely available from layout 373 // Apply the margins to the location now that they are definitely available from layout
374 LayoutUnit captionLogicalTop = collapsedMarginBeforeForChild(caption) + logi calHeight(); 374 LayoutUnit captionLogicalTop = collapsedMarginBeforeForChild(caption) + logi calHeight();
375 if (view()->layoutState()->isPaginated()) {
376 captionLogicalTop += caption.paginationStrut();
377 caption.setPaginationStrut(0);
378 }
379 caption.setLogicalLocation(LayoutPoint(caption.marginStart(), captionLogical Top)); 375 caption.setLogicalLocation(LayoutPoint(caption.marginStart(), captionLogical Top));
380 376
381 if (!selfNeedsLayout()) 377 if (!selfNeedsLayout())
382 caption.setMayNeedPaintInvalidation(); 378 caption.setMayNeedPaintInvalidation();
383 379
384 setLogicalHeight(logicalHeight() + caption.logicalHeight() + collapsedMargin BeforeForChild(caption) + collapsedMarginAfterForChild(caption)); 380 setLogicalHeight(logicalHeight() + caption.logicalHeight() + collapsedMargin BeforeForChild(caption) + collapsedMarginAfterForChild(caption));
385 } 381 }
386 382
387 void LayoutTable::distributeExtraLogicalHeight(int extraLogicalHeight) 383 void LayoutTable::distributeExtraLogicalHeight(int extraLogicalHeight)
388 { 384 {
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 || row->shouldDoFullPaintInvalidation()) 1411 || row->shouldDoFullPaintInvalidation())
1416 cell->invalidateDisplayItemClient(*cell); 1412 cell->invalidateDisplayItemClient(*cell);
1417 } 1413 }
1418 } 1414 }
1419 } 1415 }
1420 1416
1421 LayoutBlock::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState); 1417 LayoutBlock::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState);
1422 } 1418 }
1423 1419
1424 } 1420 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698