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

Unified Diff: Source/core/rendering/RenderFlexibleBox.cpp

Issue 331203002: Blink doesn't honor percent heights on children of "align-self:stretch" flex items in a fixed-height (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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
Index: Source/core/rendering/RenderFlexibleBox.cpp
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
index 7cb1c671c53bc8417cfb52b5fdccc2f719bf66aa..89e2be3db0055f221eefeb26efa5de3ce719928c 100644
--- a/Source/core/rendering/RenderFlexibleBox.cpp
+++ b/Source/core/rendering/RenderFlexibleBox.cpp
@@ -611,7 +611,7 @@ bool RenderFlexibleBox::childPreferredMainAxisContentExtentRequiresLayout(Render
LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForChild(RenderBox* child, bool hasInfiniteLineLength, bool relayoutChildren)
{
- child->clearOverrideSize();
+ clearLogicalOverrideSize(child);
if (child->style()->hasAspectRatio() || child->isImage() || child->isVideo() || child->isCanvas())
UseCounter::count(document(), UseCounter::AspectRatioFlexItem);
@@ -993,6 +993,14 @@ void RenderFlexibleBox::setLogicalOverrideSize(RenderBox* child, LayoutUnit chil
child->setOverrideLogicalContentWidth(childPreferredSize - child->borderAndPaddingLogicalWidth());
}
+void RenderFlexibleBox::clearLogicalOverrideSize(RenderBox* child)
ojan 2014/08/28 03:23:09 LogicalOverrideSize doesn't tell you which size yo
harpreet.sk 2014/08/28 14:30:20 I named this api like this just to keep consistenc
+{
+ if (hasOrthogonalFlow(child))
cbiesinger 2014/08/28 03:05:56 When the flexbox changes from a column to a row fl
harpreet.sk 2014/08/28 14:30:20 Added line to clear both override sizes.
+ child->clearOverrideLogicalContentHeight();
+ else
+ child->clearOverrideLogicalContentWidth();
+}
+
void RenderFlexibleBox::prepareChildForPositionedLayout(RenderBox* child, LayoutUnit mainAxisOffset, LayoutUnit crossAxisOffset, PositionedLayoutMode layoutMode)
{
ASSERT(child->isOutOfFlowPositioned());
@@ -1353,10 +1361,10 @@ void RenderFlexibleBox::applyStretchAlignmentToChild(RenderBox* child, LayoutUni
LayoutUnit stretchedLogicalHeight = heightBeforeStretching + availableAlignmentSpaceForChildBeforeStretching(lineCrossAxisExtent, child);
ASSERT(!child->needsLayout());
LayoutUnit desiredLogicalHeight = child->constrainLogicalHeightByMinMax(stretchedLogicalHeight, heightBeforeStretching - child->borderAndPaddingLogicalHeight());
+ child->setOverrideLogicalContentHeight(desiredLogicalHeight - child->borderAndPaddingLogicalHeight());
cbiesinger 2014/08/28 03:05:56 I think we also have to relayout if the old overri
harpreet.sk 2014/08/28 14:30:20 @Chris: The example which you have stated i think
cbiesinger 2014/08/29 00:28:09 Apologies, you are correct. I tried to make a test
// FIXME: Can avoid laying out here in some cases. See https://webkit.org/b/87905.
if (desiredLogicalHeight != child->logicalHeight()) {
- child->setOverrideLogicalContentHeight(desiredLogicalHeight - child->borderAndPaddingLogicalHeight());
child->setLogicalHeight(0);
child->forceChildLayout();
}
« Source/core/rendering/RenderBox.cpp ('K') | « Source/core/rendering/RenderFlexibleBox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698