Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12642 - notriddle:textarea_height, r=asajeffrey

Browse source 
Use explicit height of inline-block fragments

When an explicit height is used for inline-block fragments, the line spacing algorithm should use that for the height above the baseline, instead of the intrinsic one.

---

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #12492 (github issue number if applicable).
- [X] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12642)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-29 13:53:13 -05:00 • committed by GitHub
commit 8a09a0369f
4 changed files with 67 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/fragment.rs
View file

@ -2005,9 +2005,10 @@ impl Fragment {
// See CSS 2.1 § 10.8.1.
let flow = &info.flow_ref;
let block_flow = flow.as_block();
let is_auto = self.style.get_position().height == LengthOrPercentageOrAuto::Auto;
let baseline_offset = match flow.baseline_offset_of_last_line_box_in_flow() {
Some(baseline_offset) => baseline_offset,
None => block_flow.fragment.border_box.size.block,
Some(baseline_offset) if is_auto => baseline_offset,
_ => block_flow.fragment.border_box.size.block,
};
let start_margin = block_flow.fragment.margin.block_start;
let end_margin = block_flow.fragment.margin.block_end;

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -5272,6 +5272,18 @@
"url": "/_mozilla/css/text_transform_uppercase_a.html"
}
],
"css/textarea_space_calculation.html": [
{
"path": "css/textarea_space_calculation.html",
"references": [
[
"/_mozilla/css/textarea_space_calculation-ref.html",
"=="
]
],
"url": "/_mozilla/css/textarea_space_calculation.html"
}
],
"css/transform_3d.html": [
{
"path": "css/transform_3d.html",
@ -14390,6 +14402,18 @@
"url": "/_mozilla/css/text_transform_uppercase_a.html"
}
],
"css/textarea_space_calculation.html": [
{
"path": "css/textarea_space_calculation.html",
"references": [
[
"/_mozilla/css/textarea_space_calculation-ref.html",
"=="
]
],
"url": "/_mozilla/css/textarea_space_calculation.html"
}
],
"css/transform_3d.html": [
{
"path": "css/transform_3d.html",

19
tests/wpt/mozilla/tests/css/textarea_space_calculation-ref.html Normal file
View file

@ -0,0 +1,19 @@
<!doctype html>
<title>REFERENCE: textarea does not take up more space than it takes up</title>
<style>
textarea{height:2em;width:2em}
div{width:2em;font-size:12px;line-height:3px}
</style>
<h1>To pass, no red should be visible</h1>
<div>
<textarea>
1
2
3
4
5
6
8
9
</textarea>
</div>

21
tests/wpt/mozilla/tests/css/textarea_space_calculation.html Normal file
View file

@ -0,0 +1,21 @@
<!doctype html>
<meta charset="utf-8">
<title>textarea does not take up more space than it takes up</title>
<link rel="match" href="textarea_space_calculation-ref.html">
<style>
textarea{height:2em;width:2em}
div{background:red;width:2em;font-size:12px;line-height:3px}
</style>
<h1>To pass, no red should be visible</h1>
<div>
<textarea>
1
2
3
4
5
6
8
9
</textarea>
</div>