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

Auto merge of #10655 - mbrubeck:merge-margin, r=SimonSapin

Browse source 
Update margins when merging inline fragments

Fixes #10633.  r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10655)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-17 08:18:04 +05:30
commit fd994c457e
4 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/layout/fragment.rs
View file

@ -1728,6 +1728,7 @@ impl Fragment {
this_info.insertion_point = other_info.insertion_point; this_info.insertion_point = other_info.insertion_point;
} }
self.border_padding.inline_end = next_fragment.border_padding.inline_end; self.border_padding.inline_end = next_fragment.border_padding.inline_end;
self.margin.inline_end = next_fragment.margin.inline_end;
} }
_ => panic!("Can only merge two scanned-text fragments!"), _ => panic!("Can only merge two scanned-text fragments!"),
} }

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

@ -2519,6 +2519,18 @@
"url": "/_mozilla/css/inline_margin_multiple_fragments_a.html" "url": "/_mozilla/css/inline_margin_multiple_fragments_a.html"
} }
], ],
"css/inline_margin_nbsp.html": [
{
"path": "css/inline_margin_nbsp.html",
"references": [
[
"/_mozilla/css/inline_margin_nbsp_ref.html",
"=="
]
],
"url": "/_mozilla/css/inline_margin_nbsp.html"
}
],
"css/inline_margins_a.html": [ "css/inline_margins_a.html": [
{ {
"path": "css/inline_margins_a.html", "path": "css/inline_margins_a.html",
@ -9169,6 +9181,18 @@
"url": "/_mozilla/css/inline_margin_multiple_fragments_a.html" "url": "/_mozilla/css/inline_margin_multiple_fragments_a.html"
} }
], ],
"css/inline_margin_nbsp.html": [
{
"path": "css/inline_margin_nbsp.html",
"references": [
[
"/_mozilla/css/inline_margin_nbsp_ref.html",
"=="
]
],
"url": "/_mozilla/css/inline_margin_nbsp.html"
}
],
"css/inline_margins_a.html": [ "css/inline_margins_a.html": [
{ {
"path": "css/inline_margins_a.html", "path": "css/inline_margins_a.html",

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

@ -0,0 +1,5 @@
<!doctype html>
<meta charset="utf-8">
<title>inline margin non-breaking space test</title>
<link rel="match" href="inline_margin_nbsp_ref.html">
<span style="margin-right: 128px">X&nbsp;</span>Y

4
tests/wpt/mozilla/tests/css/inline_margin_nbsp_ref.html Normal file
View file

@ -0,0 +1,4 @@
<!doctype html>
<meta charset="utf-8">
<title>inline margin non-breaking space reference</title>
<span style="margin-right: 128px">X </span>Y