Commit 22079e36 authored by Christian Biesinger's avatar Christian Biesinger Committed by Commit Bot

[css-flexbox] Remove two unnecessary function calls

This is no longer necessary after https://crrev.com/c/1283482

R=dgrogan@chromium.org, ikilpatrick@chromium.org

Change-Id: I4e0b4d631481f38157072d3f331c11eb05c1f5e7
Reviewed-on: https://chromium-review.googlesource.com/c/1340958Reviewed-by: default avatarDavid Grogan <dgrogan@chromium.org>
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609021}
parent 7b4f01c4
...@@ -1633,17 +1633,9 @@ void LayoutFlexibleBox::ApplyStretchAlignmentToChild(FlexItem& flex_item) { ...@@ -1633,17 +1633,9 @@ void LayoutFlexibleBox::ApplyStretchAlignmentToChild(FlexItem& flex_item) {
if (child_needs_relayout || !child.HasOverrideLogicalHeight()) if (child_needs_relayout || !child.HasOverrideLogicalHeight())
child.SetOverrideLogicalHeight(flex_item.cross_axis_size); child.SetOverrideLogicalHeight(flex_item.cross_axis_size);
if (child_needs_relayout) { if (child_needs_relayout) {
// TODO(cbiesinger): Why is this necessary?
child.SetLogicalHeight(LayoutUnit()); child.SetLogicalHeight(LayoutUnit());
// We cache the child's intrinsic content logical height to avoid it being
// reset to the stretched height.
// FIXME: This is fragile. LayoutBoxes should be smart enough to
// determine their intrinsic content logical height correctly even when
// there's an overrideHeight.
LayoutUnit child_intrinsic_content_logical_height =
child.IntrinsicContentLogicalHeight();
child.ForceChildLayout(); child.ForceChildLayout();
child.SetIntrinsicContentLogicalHeight(
child_intrinsic_content_logical_height);
} }
} else if (!flex_item.MainAxisIsInlineAxis() && } else if (!flex_item.MainAxisIsInlineAxis() &&
child.StyleRef().LogicalWidth().IsAuto()) { child.StyleRef().LogicalWidth().IsAuto()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment