diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-17 08:18:04 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-17 08:18:04 +0530 |
| commit | fd994c457eabc9163dfef4c97f757dca97af76ff (patch) | |
| tree | ef64c162e521b20dbc3bd7c88d6606b636dc0be8 | |
| parent | 15e76eb6e2c00ba26b65df73f1954ccada7509cf (diff) | |
| parent | 782e7134725d2906da11522237d846eb600b7784 (diff) | |
| download | servo-fd994c457eabc9163dfef4c97f757dca97af76ff.tar.gz servo-fd994c457eabc9163dfef4c97f757dca97af76ff.zip | |
Auto merge of #10655 - mbrubeck:merge-margin, r=SimonSapin
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 -->
| -rw-r--r-- | components/layout/fragment.rs | 1 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 24 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/inline_margin_nbsp.html | 5 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/inline_margin_nbsp_ref.html | 4 |
4 files changed, 34 insertions, 0 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 8f2d5b83af1..5612a322b95 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1728,6 +1728,7 @@ impl Fragment { this_info.insertion_point = other_info.insertion_point; } 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!"), } diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index c9d3433cc2c..1cadcfe1765 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -2519,6 +2519,18 @@ "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": [ { "path": "css/inline_margins_a.html", @@ -9169,6 +9181,18 @@ "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": [ { "path": "css/inline_margins_a.html", diff --git a/tests/wpt/mozilla/tests/css/inline_margin_nbsp.html b/tests/wpt/mozilla/tests/css/inline_margin_nbsp.html new file mode 100644 index 00000000000..e8707bbd8df --- /dev/null +++ b/tests/wpt/mozilla/tests/css/inline_margin_nbsp.html @@ -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 </span>Y diff --git a/tests/wpt/mozilla/tests/css/inline_margin_nbsp_ref.html b/tests/wpt/mozilla/tests/css/inline_margin_nbsp_ref.html new file mode 100644 index 00000000000..5606cd61361 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/inline_margin_nbsp_ref.html @@ -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 |