Skip to content

GitLab

T
tangled
Commit b0b9a76a authored by David Grogan's avatar David Grogan Committed by Commit Bot
Browse files
Options

Revert "[LayoutNG] Set ShrinkToFit when determining MinMaxSize via layout" 

This reverts commit 4fb5e9ec.

Reason for revert: Triggered DCHECK !constraint_space.IsIntermediateLayout() || box_->NeedsLayout()

Original change's description:
> [LayoutNG] Set ShrinkToFit when determining MinMaxSize via layout
> 
> Bug: 635619
> Change-Id: I6f7b1e16098a773aab2ac395b3b23e8b2af2b99e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1920200
> Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
> Reviewed-by: Christian Biesinger <cbiesinger@chromium.org>
> Commit-Queue: David Grogan <dgrogan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#716907}

TBR=cbiesinger@chromium.org,dgrogan@chromium.org,mstensho@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 635619, 1027759
Change-Id: I961ca71602f331d2a612d430e9a4ae049e331b1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948496Reviewed-by: default avatarDavid Grogan <dgrogan@chromium.org>
Reviewed-by: default avatarMorten Stenshorne <mstensho@chromium.org>
Commit-Queue: David Grogan <dgrogan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721112}
parent 59915714
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 18 deletions
third_party/blink/renderer/core/layout/ng/ng_space_utils.cc
View file @ b0b9a76a
...@@ -38,7 +38,6 @@ NGConstraintSpace CreateIndefiniteConstraintSpaceForChild( ...@@ -38,7 +38,6 @@ NGConstraintSpace CreateIndefiniteConstraintSpaceForChild(
builder.SetAvailableSize(indefinite_size); builder.SetAvailableSize(indefinite_size);
builder.SetPercentageResolutionSize(indefinite_size); builder.SetPercentageResolutionSize(indefinite_size);
builder.SetReplacedPercentageResolutionSize(indefinite_size); builder.SetReplacedPercentageResolutionSize(indefinite_size);
builder.SetIsShrinkToFit(child.Style().LogicalWidth().IsAuto());
builder.SetIsIntermediateLayout(true); builder.SetIsIntermediateLayout(true);
return builder.ToConstraintSpace(); return builder.ToConstraintSpace();
} }
......
third_party/blink/web_tests/FlagExpectations/disable-layout-ng
View file @ b0b9a76a
...@@ -76,7 +76,6 @@ crbug.com/591099 external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi.ht ...@@ -76,7 +76,6 @@ crbug.com/591099 external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi.ht
crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004.html [ Failure ] crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004.html [ Failure ]
crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005.html [ Failure ] crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005.html [ Failure ]
crbug.com/591099 external/wpt/css/css-sizing/whitespace-and-break.html [ Failure ] crbug.com/591099 external/wpt/css/css-sizing/whitespace-and-break.html [ Failure ]
crbug.com/591099 external/wpt/css/css-sizing/ortho-writing-mode-001.html [ Failure ]
### external/wpt/css/css-text/boundary-shaping/ ### external/wpt/css/css-text/boundary-shaping/
crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-001.html [ Failure ] crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-001.html [ Failure ]
......
third_party/blink/web_tests/external/wpt/css/css-sizing/ortho-writing-mode-001.html deleted 100644 → 0
View file @ 59915714
<!DOCTYPE html>
<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes" title="first paragraph">
<link rel="help" href="https://www.w3.org/TR/css-writing-modes-4/#orthogonal-auto">
<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
<meta name="flags" content="" />
<meta name="assert" content="The intrinsic size of an orthogonal child is its shrink to fit size after layout" />
<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<div style="width:min-content; background:red;">
<div style="writing-mode:vertical-rl; background:green;">
<div style="margin-right:50%; width:50px; height:100px;"></div>
</div>
</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