diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-09-06 05:27:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 05:27:02 -0400 |
| commit | e852d02f1c02b42b5eb5b0ee592d5128f1232458 (patch) | |
| tree | 00960d39a01446fa432bea7d28120eadb27d7d6f | |
| parent | d6118923d3f12a1e621b4dc7c809312452a318d2 (diff) | |
| parent | aa0c05574c673c7d9cc688386c0c580a0e573e67 (diff) | |
| download | servo-e852d02f1c02b42b5eb5b0ee592d5128f1232458.tar.gz servo-e852d02f1c02b42b5eb5b0ee592d5128f1232458.zip | |
Auto merge of #24034 - ferjm:video.fullscreen, r=emilio
Make inline elements work in fullscreen mode
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22358
<!-- 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/24034)
<!-- Reviewable:end -->
| -rw-r--r-- | components/layout/construct.rs | 4 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 40 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/blockify_inline_element.html | 25 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/blockify_inline_element_ref.html | 23 |
4 files changed, 91 insertions, 1 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 856f8dbc52e..5c9ff1256dd 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -1878,7 +1878,9 @@ where // Inline items that are absolutely-positioned contribute inline fragment construction // results with a hypothetical fragment. (Display::Inline, _, Position::Absolute) | - (Display::InlineBlock, _, Position::Absolute) => { + (Display::Inline, _, Position::Fixed) | + (Display::InlineBlock, _, Position::Absolute) | + (Display::InlineBlock, _, Position::Fixed) => { let construction_result = self.build_fragment_for_absolutely_positioned_inline(node); self.set_flow_construction_result(node, construction_result) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index a623d546a60..8afa233be11 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -1,5 +1,11 @@ { "items": { + "conformancechecker": { + "css/blockify_inline_element.html": [] + }, + "manual": { + "css/blockify_inline_element.html": [] + }, "reftest": { "css/abs-overflow-stackingcontext.html": [ [ @@ -779,6 +785,18 @@ {} ] ], + "css/blockify_inline_element.html": [ + [ + "css/blockify_inline_element.html", + [ + [ + "/_mozilla/css/blockify_inline_element_ref.html", + "==" + ] + ], + {} + ] + ], "css/blur_a.html": [ [ "css/blur_a.html", @@ -7640,6 +7658,9 @@ ] ] }, + "stub": { + "css/blockify_inline_element.html": [] + }, "support": { ".gitignore": [ [] @@ -7866,6 +7887,10 @@ "css/block_replaced_content_ref.html": [ [] ], + "css/blockify_inline_element.html": [], + "css/blockify_inline_element_ref.html": [ + [] + ], "css/blur_ref.html": [ [] ], @@ -11096,6 +11121,7 @@ {} ] ], + "css/blockify_inline_element.html": [], "css/bug_1345483.html": [ [ "css/bug_1345483.html", @@ -12515,6 +12541,12 @@ {} ] ] + }, + "visual": { + "css/blockify_inline_element.html": [] + }, + "wdspec": { + "css/blockify_inline_element.html": [] } }, "paths": { @@ -13942,6 +13974,14 @@ "4d48d763eb784170f680276541d864681a05962b", "support" ], + "css/blockify_inline_element.html": [ + "7f9da081c8e246c7d72a85ecfd129a5ddc56e07a", + "reftest" + ], + "css/blockify_inline_element_ref.html": [ + "ad88ac2f3f7e4b56a3781e61655dc580806fc4cd", + "support" + ], "css/blur_a.html": [ "a75af6a020711df2b97caa6b32f4d3cc445d1178", "reftest" diff --git a/tests/wpt/mozilla/tests/css/blockify_inline_element.html b/tests/wpt/mozilla/tests/css/blockify_inline_element.html new file mode 100644 index 00000000000..7f9da081c8e --- /dev/null +++ b/tests/wpt/mozilla/tests/css/blockify_inline_element.html @@ -0,0 +1,25 @@ +<!doctype html> +<meta charset="utf-8"> +<title>Blockify inline/inline-block elements</title> +<link rel="match" href="blockify_inline_element_ref.html"> +<style> + span { + width: 50px; + height: 50px; + position: fixed; + } + .blue { + display: inline; + top: 0; + left: 0; + background: blue; + } + .red { + display: inline-block; + top: 50; + left: 0; + background: red; + } +</style> +<span class="blue"></span> +<div><span class="red"></span></div> diff --git a/tests/wpt/mozilla/tests/css/blockify_inline_element_ref.html b/tests/wpt/mozilla/tests/css/blockify_inline_element_ref.html new file mode 100644 index 00000000000..ad88ac2f3f7 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/blockify_inline_element_ref.html @@ -0,0 +1,23 @@ +<!doctype html> +<meta charset="utf-8"> +<title>Blockify inline/inline-block element</title> +<style> + span { + display: block; + position: fixed; + width: 50px; + height: 50px; + } + .blue { + top: 0; + left: 0; + background: blue; + } + .red { + top: 50; + left: 0; + background: red; + } +</style> +<span class="blue"></span> +<span class="red"></span> |