mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 1486086: Switch to use logical axes, for stale physical-axis-based flex-item border/padding calculation. r=mats
Differential Revision: https://phabricator.services.mozilla.com/D4974 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Daniel Holbert
parent
e3df1a80e2
commit
b93eae7de2
@ -4252,10 +4252,8 @@ nsFlexContainerFrame::SizeItemInCrossAxis(
|
||||
// Tentatively store the child's desired content-box cross-size.
|
||||
// Note that childDesiredSize is the border-box size, so we have to
|
||||
// subtract border & padding to get the content-box size.
|
||||
// (Note that at this point in the code, we know our cross axis is vertical,
|
||||
// so we don't bother with making aAxisTracker pick the cross-axis component
|
||||
// for us.)
|
||||
nscoord crossAxisBorderPadding = aItem.GetBorderPadding().TopBottom();
|
||||
nscoord crossAxisBorderPadding =
|
||||
aItem.GetBorderPaddingSizeInAxis(aAxisTracker.GetCrossAxis());
|
||||
if (reflowResult.BSize() < crossAxisBorderPadding) {
|
||||
// Child's requested size isn't large enough for its border/padding!
|
||||
// This is OK for the trivial nsFrame::Reflow() impl, but other frame
|
||||
|
||||
@ -0,0 +1,136 @@
|
||||
<!DOCTYPE html>
|
||||
<!--
|
||||
Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<html>
|
||||
<head>
|
||||
<title>CSS Reftest Reference</title>
|
||||
<meta charset="utf-8">
|
||||
<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
|
||||
<style>
|
||||
.container {
|
||||
display: block;
|
||||
border: 2px solid purple;
|
||||
margin: 3px;
|
||||
/* This red should't be visible, because each container should shrinkwrap
|
||||
its sole child (and the child should cover up this background). */
|
||||
background: red;
|
||||
/* Float the containers, to test in "rows", with 1 row per writing-mode. */
|
||||
float: left;
|
||||
}
|
||||
br { clear: both; }
|
||||
|
||||
.container > * {
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
background: teal;
|
||||
border: 1px solid yellow;
|
||||
}
|
||||
.container > * > * {
|
||||
background: pink;
|
||||
height: 4px;
|
||||
width: 4px;
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
.pad_top { padding-top: 3px; }
|
||||
.pad_right { padding-right: 4px; }
|
||||
.pad_bottom { padding-bottom: 5px; }
|
||||
.pad_left { padding-left: 6px; }
|
||||
|
||||
.hl { writing-mode: horizontal-tb; direction: ltr; }
|
||||
.hr { writing-mode: horizontal-tb; direction: rtl; }
|
||||
.vl { writing-mode: vertical-lr; direction: ltr; }
|
||||
.vr { writing-mode: vertical-rl; direction: ltr; }
|
||||
.vl_rtl { writing-mode: vertical-lr; direction: rtl; }
|
||||
.vr_rtl { writing-mode: vertical-rl; direction: rtl; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Here, we test padding on each side of a flex item, across 6 different
|
||||
writing-mode combinations (writing-mode X direction). -->
|
||||
<div class="container hl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container hr">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vr">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,144 @@
|
||||
<!DOCTYPE html>
|
||||
<!--
|
||||
Any copyright is dedicated to the Public Domain.
|
||||
http://creativecommons.org/publicdomain/zero/1.0/
|
||||
-->
|
||||
<html>
|
||||
<head>
|
||||
<title>
|
||||
CSS Test: Testing auto-sized flex containers
|
||||
with various 'writing-mode' values
|
||||
and various padding amounts on flex items.
|
||||
</title>
|
||||
<meta charset="utf-8">
|
||||
<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
|
||||
<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-direction-property">
|
||||
<link rel="help" href="https://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode">
|
||||
<link rel="match" href="flexbox-writing-mode-016-ref.html">
|
||||
<style>
|
||||
.container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
border: 2px solid purple;
|
||||
margin: 3px;
|
||||
/* This red should't be visible, because each container should shrinkwrap
|
||||
its sole child (and the child should cover up this background). */
|
||||
background: red;
|
||||
/* Float the containers, to test in "rows", with 1 row per writing-mode. */
|
||||
float: left;
|
||||
}
|
||||
br { clear: both; }
|
||||
|
||||
.container > * {
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
background: teal;
|
||||
border: 1px solid yellow;
|
||||
}
|
||||
.container > * > * {
|
||||
background: pink;
|
||||
height: 4px;
|
||||
width: 4px;
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
.pad_top { padding-top: 3px; }
|
||||
.pad_right { padding-right: 4px; }
|
||||
.pad_bottom { padding-bottom: 5px; }
|
||||
.pad_left { padding-left: 6px; }
|
||||
|
||||
.hl { writing-mode: horizontal-tb; direction: ltr; }
|
||||
.hr { writing-mode: horizontal-tb; direction: rtl; }
|
||||
.vl { writing-mode: vertical-lr; direction: ltr; }
|
||||
.vr { writing-mode: vertical-rl; direction: ltr; }
|
||||
.vl_rtl { writing-mode: vertical-lr; direction: rtl; }
|
||||
.vr_rtl { writing-mode: vertical-rl; direction: rtl; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Here, we test padding on each side of a flex item, across 6 different
|
||||
writing-mode combinations (writing-mode X direction). -->
|
||||
<div class="container hl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container hl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container hr">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container hr">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vr">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vl_rtl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_top"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_right"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_bottom"><div></div></div>
|
||||
</div>
|
||||
<div class="container vr_rtl">
|
||||
<div class="pad_left"><div></div></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -261,6 +261,7 @@ fails == flexbox-min-height-auto-002b.html flexbox-min-height-auto-002-ref.html
|
||||
== flexbox-writing-mode-013.html flexbox-writing-mode-013-ref.html
|
||||
== flexbox-writing-mode-014.html flexbox-writing-mode-014-ref.html
|
||||
== flexbox-writing-mode-015.html flexbox-writing-mode-015-ref.html
|
||||
== flexbox-writing-mode-016.html flexbox-writing-mode-016-ref.html
|
||||
|
||||
# Single-line size clamping
|
||||
== flexbox-single-line-clamp-1.html flexbox-single-line-clamp-1-ref.html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user