Skip to content

GitLab

T
tangled
Commit d205bfa3 authored by Christian Biesinger's avatar Christian Biesinger Committed by Commit Bot
Browse files
Options

[css-flexbox] Use ComputeLogicalHeight for the unstretched height 

The height version of https://crrev.com/c/1590508 -- we again did not
handle images correctly.

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

Bug: 957943
Change-Id: Ie849c097e14d883ea65f3d316313b7da4f660a97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594059
Auto-Submit: Christian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#656426}
parent 34d26ec0
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 2 deletions
third_party/blink/renderer/core/layout/layout_flexible_box.cc
View file @ d205bfa3
...@@ -515,8 +515,10 @@ LayoutUnit LayoutFlexibleBox::ChildUnstretchedLogicalHeight( ...@@ -515,8 +515,10 @@ LayoutUnit LayoutFlexibleBox::ChildUnstretchedLogicalHeight(
LayoutUnit child_intrinsic_logical_height = LayoutUnit child_intrinsic_logical_height =
child_intrinsic_content_logical_height + child_intrinsic_content_logical_height +
child.ScrollbarLogicalHeight() + child.BorderAndPaddingLogicalHeight(); child.ScrollbarLogicalHeight() + child.BorderAndPaddingLogicalHeight();
return child.ConstrainLogicalHeightByMinMax( LogicalExtentComputedValues values;
child_intrinsic_logical_height, child_intrinsic_content_logical_height); child.ComputeLogicalHeight(child_intrinsic_logical_height, LayoutUnit(),
values);
return values.extent_;
} }
return child.LogicalHeight(); return child.LogicalHeight();
} }
......
third_party/blink/web_tests/external/wpt/css/css-flexbox/auto-margins-002.html 0 → 100644
View file @ d205bfa3
<!DOCTYPE html>
<title>css-flexbox: Tests that we correctly align an image with auto margins and max-height</title>
<link rel="author" title="Google LLC" href="https://www.google.com/">
<link rel="help" href="https://drafts.csswg.org/css-flexbox/#auto-margins" title="8.1. Aligning with 'auto' margins">
<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<!-- we position this div on top of the flexbox to cover up the red where
we expect it to be; letting the red in the wrong places shine through -->
<div style="position: absolute; height: 100px; width: 100px; z-index: 1;">
<div style="height: 25px; background: green;"></div>
<div style="height: 50px; background: transparent;"></div>
<div style="height: 25px; background: green;"></div>
</div>
<div style="width: 100px; height: 100px; background: red; display: flex;">
<img src="support/300x150-green.png" style="margin: auto; max-width: 100%; max-height: 100px;">
</div>
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