Skip to content

GitLab

T
tangled
Commit dcd85260 authored by Aleks Totic's avatar Aleks Totic Committed by Commit Bot
Browse files
Options

[LayoutNG] Fix DCHECK abspos crash 

Do not DCHECK if values are saturated.

Bug: 996085
Change-Id: I1f9b299aef1f8bd5f18d6f4f05d50e33a7c1609d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769517
Commit-Queue: Aleks Totic <atotic@chromium.org>
Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690402}
parent 11f4c016
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 4 deletions
third_party/blink/renderer/core/layout/ng/ng_absolute_utils.cc
View file @ dcd85260
......@@ -113,7 +113,9 @@ void ComputeAbsoluteSize(const LayoutUnit border_padding_size,
if (!inset_end_length.IsAuto()) {
inset_end = MinimumValueForLength(inset_end_length, available_size);
}
#if DCHECK_IS_ON()
bool values_might_be_saturated = false;
#endif
// Solving the equation:
// |inset_start| + |margin_start| + |size| + |margin_end| + |inset_end| =
// |available_size|
......@@ -145,6 +147,10 @@ void ComputeAbsoluteSize(const LayoutUnit border_padding_size,
// Compute margins.
LayoutUnit margin_space =
available_size - *inset_start - *inset_end - *size;
#if DCHECK_IS_ON()
values_might_be_saturated |= margin_space.MightBeSaturated();
#endif
if (!margin_start && !margin_end) {
// When both margins are auto.
if (margin_space > 0 || is_block_direction) {
......@@ -167,6 +173,9 @@ void ComputeAbsoluteSize(const LayoutUnit border_padding_size,
} else {
// Are the values over-constrained?
LayoutUnit margin_extra = margin_space - *margin_start - *margin_end;
#if DCHECK_IS_ON()
values_might_be_saturated |= margin_extra.MightBeSaturated();
#endif
if (margin_extra) {
// Relax the end.
if (is_start_dominant)
......@@ -226,10 +235,12 @@ void ComputeAbsoluteSize(const LayoutUnit border_padding_size,
}
#if DCHECK_IS_ON()
values_might_be_saturated |=
inset_start->MightBeSaturated() || inset_end->MightBeSaturated() ||
size->MightBeSaturated() || margin_start->MightBeSaturated() ||
margin_end->MightBeSaturated() || available_size.MightBeSaturated();
// The DCHECK is useful, but only holds true if the values aren't saturated.
if (!inset_start->MightBeSaturated() && !inset_end->MightBeSaturated() &&
!size->MightBeSaturated() && !margin_start->MightBeSaturated() &&
!margin_end->MightBeSaturated() && !available_size.MightBeSaturated()) {
if (!values_might_be_saturated) {
DCHECK_EQ(available_size,
*inset_start + *inset_end + *margin_start + *margin_end + *size);
}
......
third_party/blink/web_tests/external/wpt/css/css-position/position-absolute-crash-chrome-012.html 0 → 100644
View file @ dcd85260
<!doctype html>
<link rel="help" href="https://crbug.com/996085">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>test(()=>{})</script>
<style>
#container {
width: 600px;
position: relative;
}
#target {
position: absolute;
left: 0px;
right: 33554000px;
width: 10px;
margin-left: 33554432px;
margin-right: 33554432px;
height: 20px;
}
</style>
<body>
<div id="container">
<div id="target"></div>
</div>
</body>
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