mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #25715 - mrobinson:position-fixed, r=SimonSapin
Improve position:fixed support in layout_2020 <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
f3dbe7d388
4 changed files with 136 additions and 43 deletions
|
@ -14,8 +14,10 @@ use mitochondria::OnceCell;
|
|||
use net_traits::image_cache::UsePlaceholder;
|
||||
use std::sync::Arc;
|
||||
use style::computed_values::overflow_x::T as ComputedOverflow;
|
||||
use style::computed_values::position::T as ComputedPosition;
|
||||
use style::dom::OpaqueNode;
|
||||
use style::properties::ComputedValues;
|
||||
|
||||
use style::values::computed::{BorderStyle, Length, LengthPercentage};
|
||||
use style::values::specified::ui::CursorKind;
|
||||
use webrender_api::{self as wr, units};
|
||||
|
@ -244,20 +246,40 @@ impl<'a> BuilderForBoxFragment<'a> {
|
|||
}
|
||||
|
||||
fn build(&mut self, builder: &mut DisplayListBuilder) {
|
||||
let hit_info = hit_info(&self.fragment.style, self.fragment.tag, Cursor::Default);
|
||||
if hit_info.is_some() {
|
||||
let mut common = builder.common_properties(self.border_rect);
|
||||
common.hit_info = hit_info;
|
||||
if let Some(clip_id) = self.border_edge_clip(builder) {
|
||||
common.clip_id = clip_id
|
||||
}
|
||||
builder.wr.push_hit_test(&common)
|
||||
}
|
||||
|
||||
builder.clipping_and_scrolling_scope(|builder| {
|
||||
self.adjust_spatial_id_for_positioning(builder);
|
||||
self.build_hit_test(builder);
|
||||
self.build_background(builder);
|
||||
self.build_border(builder);
|
||||
|
||||
builder.clipping_and_scrolling_scope(|builder| {
|
||||
// We want to build the scroll frame after the background and border, because
|
||||
// they shouldn't scroll with the rest of the box content.
|
||||
self.build_scroll_frame_if_necessary(builder);
|
||||
|
||||
let content_rect = self
|
||||
.fragment
|
||||
.content_rect
|
||||
.to_physical(self.fragment.style.writing_mode, self.containing_block)
|
||||
.translate(self.containing_block.origin.to_vector());
|
||||
for child in &self.fragment.children {
|
||||
child.build_display_list(builder, &content_rect)
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn adjust_spatial_id_for_positioning(&self, builder: &mut DisplayListBuilder) {
|
||||
if self.fragment.style.get_box().position != ComputedPosition::Fixed {
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO(mrobinson): Eventually this should use the spatial id of the reference
|
||||
// frame that is the parent of this one once we have full support for stacking
|
||||
// contexts and transforms.
|
||||
builder.current_space_and_clip.spatial_id =
|
||||
wr::SpatialId::root_reference_frame(builder.wr.pipeline_id);
|
||||
}
|
||||
|
||||
fn build_scroll_frame_if_necessary(&self, builder: &mut DisplayListBuilder) {
|
||||
let overflow_x = self.fragment.style.get_box().overflow_x;
|
||||
let overflow_y = self.fragment.style.get_box().overflow_y;
|
||||
let original_scroll_and_clip_info = builder.current_space_and_clip;
|
||||
|
@ -289,16 +311,18 @@ impl<'a> BuilderForBoxFragment<'a> {
|
|||
wr::units::LayoutVector2D::zero(),
|
||||
);
|
||||
}
|
||||
|
||||
let content_rect = self
|
||||
.fragment
|
||||
.content_rect
|
||||
.to_physical(self.fragment.style.writing_mode, self.containing_block)
|
||||
.translate(self.containing_block.origin.to_vector());
|
||||
for child in &self.fragment.children {
|
||||
child.build_display_list(builder, &content_rect)
|
||||
}
|
||||
});
|
||||
|
||||
fn build_hit_test(&self, builder: &mut DisplayListBuilder) {
|
||||
let hit_info = hit_info(&self.fragment.style, self.fragment.tag, Cursor::Default);
|
||||
if hit_info.is_some() {
|
||||
let mut common = builder.common_properties(self.border_rect);
|
||||
common.hit_info = hit_info;
|
||||
if let Some(clip_id) = self.border_edge_clip(builder) {
|
||||
common.clip_id = clip_id
|
||||
}
|
||||
builder.wr.push_hit_test(&common)
|
||||
}
|
||||
}
|
||||
|
||||
fn build_background(&mut self, builder: &mut DisplayListBuilder) {
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
{
|
||||
"items": {
|
||||
"conformancechecker": {
|
||||
"css/position_fixed_scroll.html": []
|
||||
},
|
||||
"crashtest": {
|
||||
"css/position_fixed_scroll.html": []
|
||||
},
|
||||
"manual": {
|
||||
"css/position_fixed_scroll.html": []
|
||||
},
|
||||
"reftest": {
|
||||
"css/abs-overflow-stackingcontext.html": [
|
||||
[
|
||||
|
@ -5057,6 +5066,18 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"css/position_fixed_scroll.html": [
|
||||
[
|
||||
"css/position_fixed_scroll.html",
|
||||
[
|
||||
[
|
||||
"/_mozilla/css/position_fixed_scroll_ref.html",
|
||||
"=="
|
||||
]
|
||||
],
|
||||
{}
|
||||
]
|
||||
],
|
||||
"css/position_fixed_simple_a.html": [
|
||||
[
|
||||
"css/position_fixed_simple_a.html",
|
||||
|
@ -8977,6 +8998,10 @@
|
|||
"css/position_fixed_overflow_b.html": [
|
||||
[]
|
||||
],
|
||||
"css/position_fixed_scroll.html": [],
|
||||
"css/position_fixed_scroll_ref.html": [
|
||||
[]
|
||||
],
|
||||
"css/position_fixed_simple_b.html": [
|
||||
[]
|
||||
],
|
||||
|
@ -11253,6 +11278,7 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"css/position_fixed_scroll.html": [],
|
||||
"css/stylesheet_media_queries.html": [
|
||||
[
|
||||
"css/stylesheet_media_queries.html",
|
||||
|
@ -12596,6 +12622,12 @@
|
|||
{}
|
||||
]
|
||||
]
|
||||
},
|
||||
"visual": {
|
||||
"css/position_fixed_scroll.html": []
|
||||
},
|
||||
"wdspec": {
|
||||
"css/position_fixed_scroll.html": []
|
||||
}
|
||||
},
|
||||
"paths": {
|
||||
|
@ -16959,6 +16991,14 @@
|
|||
"a8947566153c187ba3191084f89d0163bc5b666e",
|
||||
"support"
|
||||
],
|
||||
"css/position_fixed_scroll.html": [
|
||||
"712265957f2c2ff0102eab09219b44bc5bf7f032",
|
||||
"reftest"
|
||||
],
|
||||
"css/position_fixed_scroll_ref.html": [
|
||||
"dc2e72a96ac2d82f038605812c79b9f78c1547dd",
|
||||
"support"
|
||||
],
|
||||
"css/position_fixed_simple_a.html": [
|
||||
"d01b955091107990d014e7f7be9c1181e5b06d66",
|
||||
"reftest"
|
||||
|
|
17
tests/wpt/mozilla/tests/css/position_fixed_scroll.html
Normal file
17
tests/wpt/mozilla/tests/css/position_fixed_scroll.html
Normal file
|
@ -0,0 +1,17 @@
|
|||
<html>
|
||||
<head>
|
||||
<link rel=match href=position_fixed_scroll_ref.html>
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div style="height: 100px; width: 100px; background: green; position: fixed;"></div>
|
||||
<div style="height: 5000px;"></div>
|
||||
<script>
|
||||
window.scrollTo(0, 100);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
12
tests/wpt/mozilla/tests/css/position_fixed_scroll_ref.html
Normal file
12
tests/wpt/mozilla/tests/css/position_fixed_scroll_ref.html
Normal file
|
@ -0,0 +1,12 @@
|
|||
<html>
|
||||
<head>
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div style="height: 100px; width: 100px; background: green;"></div>
|
||||
</body>
|
||||
</html>
|
Loading…
Add table
Add a link
Reference in a new issue