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

Unified Diff: Source/core/layout/LayoutBlockFlow.cpp

Issue 1121173002: Fix shrink-to-fit when children's writing-mode is orthogonal (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: float tests added + cleanup a bit Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlockFlow.cpp
diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp
index 40f01f81436b7517574d9b64912f659e33c9ac2b..e2ca2692600deec076a2d774a94e620d4165b38b 100644
--- a/Source/core/layout/LayoutBlockFlow.cpp
+++ b/Source/core/layout/LayoutBlockFlow.cpp
@@ -391,6 +391,7 @@ void LayoutBlockFlow::layoutBlock(bool relayoutChildren)
inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &pageLogicalHeight, SubtreeLayoutScope& layoutScope)
{
LayoutUnit oldLeft = logicalLeft();
+recalcLogicalWidthAfterLayoutChildren:
bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
relayoutChildren |= logicalWidthChanged;
@@ -438,6 +439,12 @@ inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
else
layoutBlockChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge);
+ if (needsRecalcLogicalWidthAfterLayoutChildren()) {
+ clearNeedsRecalcLogicalWidthAfterLayoutChildren();
+ setPreferredLogicalWidthsDirty(MarkOnlyThis);
+ goto recalcLogicalWidthAfterLayoutChildren;
esprehn 2015/05/21 01:52:54 I think you can just return false here instead, th
kojii 2015/05/23 00:22:47 Done.
+ }
+
// Expand our intrinsic height to encompass floats.
if (lowestFloatLogicalBottom() > (logicalHeight() - afterEdge) && createsNewFormattingContext())
setLogicalHeight(lowestFloatLogicalBottom() + afterEdge);
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutBlockFlowLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698