Index: Source/core/rendering/RenderFlexibleBox.cpp |
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp |
index 6114d5654cd0fe113c50d191fd0a018597dff66b..0b3c99cdcd7f57f8ee9150a0af9561fbe58a2f7f 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.cpp |
+++ b/Source/core/rendering/RenderFlexibleBox.cpp |
@@ -1375,8 +1375,10 @@ void RenderFlexibleBox::applyStretchAlignmentToChild(RenderBox* child, LayoutUni |
// FIXME: Can avoid laying out here in some cases. See https://webkit.org/b/87905. |
if (desiredLogicalHeight != child->logicalHeight()) { |
cbiesinger
2014/06/25 04:14:32
So I just realized there's another bug here. Even
harpreet.sk
2014/06/25 14:43:08
For the given case i think we need to do relayout
|
child->setOverrideLogicalContentHeight(desiredLogicalHeight - child->borderAndPaddingLogicalHeight()); |
+ child->setOverrideContainingBlockContentLogicalHeight(desiredLogicalHeight - child->borderAndPaddingLogicalHeight()); |
child->setLogicalHeight(0); |
child->forceChildLayout(); |
+ child->clearOverrideContainingBlockContentLogicalHeight(); |
} |
} |
} else if (isColumnFlow() && child->style()->logicalWidth().isAuto()) { |