Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix block size for absolute replaced element #19184

Merged
merged 5 commits into from Jul 14, 2018
+118 −1
Merged

fix block size for absolute replaced element #19184

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21e2ed5
fix block size for absolute replaced element
bobthekingofegypt Nov 11, 2017
e926bef
add title to absolute div test case
bobthekingofegypt Nov 20, 2017
0eb8c06
move padding adjustments to inside is_replaced condition
bobthekingofegypt Nov 22, 2017
20cf171
update manifest
bobthekingofegypt Nov 22, 2017
d723712
fix linelength warning
bobthekingofegypt Nov 22, 2017
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

4 components/layout/block.rs
View file
Open in desktop
@@ -1259,7 +1259,8 @@ impl BlockFlow {
// TODO: Right now, this content block-size value includes the
// margin because of erroneous block-size calculation in fragment.
// Check this when that has been fixed.
let block_size_used_val = self.fragment.border_box.size.block;
let block_size_used_val = self.fragment.border_box.size.block -
self.fragment.border_padding.block_start_end();
solution = Some(BSizeConstraintSolution::solve_vertical_constraints_abs_replaced(
block_size_used_val,
margin_block_start,
@@ -1301,6 +1302,7 @@ impl BlockFlow {
}

let block_size = solution.block_size + self.fragment.border_padding.block_start_end();

self.fragment.border_box.size.block = block_size;
self.base.position.size.block = block_size;

50 tests/wpt/mozilla/meta/MANIFEST.json
View file
Open in desktop
@@ -73,6 +73,18 @@
{}
]
],
"css/absolute_div_with_padding.html": [
[
"/_mozilla/css/absolute_div_with_padding.html",
[
[
"/_mozilla/css/absolute_div_with_padding_ref.html",
"=="
]
],
{}
]
],
"css/absolute_hypothetical_float.html": [
[
"/_mozilla/css/absolute_hypothetical_float.html",
@@ -109,6 +121,18 @@
{}
]
],
"css/absolute_img_with_padding.html": [
[
"/_mozilla/css/absolute_img_with_padding.html",
[
[
"/_mozilla/css/absolute_img_with_padding_ref.html",
"=="
]
],
{}
]
],
"css/absolute_inline_containing_block_a.html": [
[
"/_mozilla/css/absolute_inline_containing_block_a.html",
@@ -7891,6 +7915,11 @@
{}
]
],
"css/absolute_div_with_padding_ref.html": [
[
{}
]
],
"css/absolute_hypothetical_float_ref.html": [
[
{}
@@ -7906,6 +7935,11 @@
{}
]
],
"css/absolute_img_with_padding_ref.html": [
[
{}
]
],
"css/absolute_inline_containing_block_ref.html": [
[
{}
"e38f77f3a7691b11abeece839aba62ce9246ff6a",
"support"
],
"css/absolute_div_with_padding.html": [
"a3f85092cde2ff19120d95be8edb834a8db97b39",
"reftest"
],
"css/absolute_div_with_padding_ref.html": [
"794a23ea9ff6597273cad61ec9755df727d58f3f",
"support"
],
"css/absolute_hypothetical_float.html": [
"1abe08648b55df2390cb2b6561923aa576212fbf",
"reftest"
"400117a1d118ee05db150877aa81bb414f4e7200",
"support"
],
"css/absolute_img_with_padding.html": [
"ae552f695fabf59becc33a274e5b3e2f5ad2d92e",
"reftest"
],
"css/absolute_img_with_padding_ref.html": [
"3f949e99ab09c5f8ce352a7987330d99023d7f0d",
"support"
],
"css/absolute_inline_containing_block_a.html": [
"8174a236497815db250a3b11aeb322e0e9c7c74f",
"reftest"
24 tests/wpt/mozilla/tests/css/absolute_div_with_padding.html
View file
Open in desktop
@@ -0,0 +1,24 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: Absolute position div with padding should not increase in size</title>
<link rel="match" href="absolute_div_with_padding_ref.html">
<style>
.absolute{
position: absolute;
top: 0px;
left: 0px;
padding: 100px;
width: 150px;
height: 150px;
background-color: green;
}
.box{
width: 350px;
height: 350px;
position: relative;
background: red;
}
</style>
<div class="box">
<div class="absolute"></div>
</div>
20 tests/wpt/mozilla/tests/css/absolute_div_with_padding_ref.html
View file
Open in desktop
@@ -0,0 +1,20 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: Absolute position div with padding should not increase in size</title>
<style>
.absolute{
padding: 100px;
width: 150px;
height: 150px;
background-color: green;
}
.box{
width: 350px;
height: 350px;
position: relative;
background: red;
}
</style>
<div class="box">
<div class="absolute"></div>
</div>
15 tests/wpt/mozilla/tests/css/absolute_img_with_padding.html
View file
Open in desktop
@@ -0,0 +1,15 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: Absolute position image with padding should not increase in size</title>
<link rel="match" href="absolute_img_with_padding_ref.html">
<body>
<style>
img{
position: absolute;
top: 0px;
left: 0px;
padding: 100px;
}
</style>
<img src="100x100_green.png" alt="img">
</body>
6 tests/wpt/mozilla/tests/css/absolute_img_with_padding_ref.html
View file
Open in desktop
@@ -0,0 +1,6 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: Absolute position image with padding should not increase in size</title>
<body style="margin:0">
<img style="padding: 100px;" src="100x100_green.png" alt="img">
</body>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.