Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Account for the font of empty input fields

Browse source 
Fixes #11653
This commit is contained in:
Michael Howell 2016-06-19 08:54:05 -07:00
parent b082dceebc
commit 4717cea51c
4 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/fragment.rs
View file

@ -1972,16 +1972,16 @@ impl Fragment {
ascent: computed_block_size + self.border_padding.block_start, ascent: computed_block_size + self.border_padding.block_start,
} }
} }
SpecificFragmentInfo::ScannedText(ref text_fragment) => { SpecificFragmentInfo::ScannedText(ref info) => {
// Fragments with no glyphs don't contribute any inline metrics. // Fragments with no glyphs don't contribute any inline metrics.
// TODO: Filter out these fragments during flow construction? // TODO: Filter out these fragments during flow construction?
if text_fragment.content_size.inline == Au(0) { if info.insertion_point.is_none() && info.content_size.inline == Au(0) {
return InlineMetrics::new(Au(0), Au(0), Au(0)); return InlineMetrics::new(Au(0), Au(0), Au(0));
} }
// See CSS 2.1 § 10.8.1. // See CSS 2.1 § 10.8.1.
let line_height = self.calculate_line_height(layout_context); let line_height = self.calculate_line_height(layout_context);
let font_derived_metrics = let font_derived_metrics =
InlineMetrics::from_font_metrics(&text_fragment.run.font_metrics, line_height); InlineMetrics::from_font_metrics(&info.run.font_metrics, line_height);
InlineMetrics { InlineMetrics {
block_size_above_baseline: font_derived_metrics.block_size_above_baseline + block_size_above_baseline: font_derived_metrics.block_size_above_baseline +
self.border_padding.block_start, self.border_padding.block_start,

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

@ -2724,6 +2724,18 @@
"url": "/_mozilla/css/input_button_size_a.html" "url": "/_mozilla/css/input_button_size_a.html"
} }
], ],
"css/input_empty_equiv.html": [
{
"path": "css/input_empty_equiv.html",
"references": [
[
"/_mozilla/css/input_empty_equiv_ref.html",
"=="
]
],
"url": "/_mozilla/css/input_empty_equiv.html"
}
],
"css/input_height_a.html": [ "css/input_height_a.html": [
{ {
"path": "css/input_height_a.html", "path": "css/input_height_a.html",
@ -9782,6 +9794,18 @@
"url": "/_mozilla/css/input_button_size_a.html" "url": "/_mozilla/css/input_button_size_a.html"
} }
], ],
"css/input_empty_equiv.html": [
{
"path": "css/input_empty_equiv.html",
"references": [
[
"/_mozilla/css/input_empty_equiv_ref.html",
"=="
]
],
"url": "/_mozilla/css/input_empty_equiv.html"
}
],
"css/input_height_a.html": [ "css/input_height_a.html": [
{ {
"path": "css/input_height_a.html", "path": "css/input_height_a.html",

6
tests/wpt/mozilla/tests/css/input_empty_equiv.html Normal file
View file

@ -0,0 +1,6 @@
<!doctype html>
<meta charset="utf-8">
<title>An input field is drawn the same with or without content</title>
<link rel="match" href="input_empty_equiv_ref.html">
<input></input>
<script>document.getElementsByTagName("input")[0].focus()</script>

5
tests/wpt/mozilla/tests/css/input_empty_equiv_ref.html Normal file
View file

@ -0,0 +1,5 @@
<!doctype html>
<meta charset="utf-8">
<title>An input field is drawn the same with or without content</title>
<input value=" "></input>
<script>document.getElementsByTagName("input")[0].focus()</script>