Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7102 - pcwalton:li-absolute-containing-block, r=glennw

Browse source 
layout: Allow list items to be absolute containing blocks.

Fixes overflowing highlight in the side menu on GitHub.

r? @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7102)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-08 17:16:14 -06:00
commit b00583bd4e
4 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/layout/list_item.rs
View file

@ -24,7 +24,7 @@ use util::geometry::Au;
use util::logical_geometry::LogicalSize;
use util::opts;
use style::properties::ComputedValues;
use style::computed_values::list_style_type;
use style::computed_values::{list_style_type, position};
use std::sync::Arc;
/// A block with the CSS `display` property equal to `list-item`.
@ -130,6 +130,10 @@ impl Flow for ListItemFlow {
self.block_flow.place_float_if_applicable(layout_context)
}
fn is_absolute_containing_block(&self) -> bool {
self.block_flow.is_absolute_containing_block()
}
fn update_late_computed_inline_position_if_necessary(&mut self, inline_position: Au) {
self.block_flow.update_late_computed_inline_position_if_necessary(inline_position)
}
@ -157,11 +161,18 @@ impl Flow for ListItemFlow {
self.block_flow.generated_containing_block_size(flow)
}
/// The 'position' property of this flow.
fn positioning(&self) -> position::T {
self.block_flow.positioning()
}
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
level: i32,
stacking_context_position: &Point2D<Au>) {
self.block_flow.iterate_through_fragment_border_boxes(iterator, level, stacking_context_position);
self.block_flow.iterate_through_fragment_border_boxes(iterator,
level,
stacking_context_position);
for marker in &self.marker_fragments {
if iterator.should_process(marker) {

1
tests/ref/basic.list
View file

@ -185,6 +185,7 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at
== legacy_td_width_attribute_a.html legacy_td_width_attribute_ref.html
== legacy_th_width_attribute_a.html legacy_td_width_attribute_ref.html
== letter_spacing_a.html letter_spacing_ref.html
== li_absolute_containing_block_a.html li_absolute_containing_block_ref.html
== line_breaking_whitespace_collapse_a.html line_breaking_whitespace_collapse_ref.html
== line_height_a.html line_height_ref.html
== line_height_float_placement_a.html line_height_float_placement_ref.html

19
tests/ref/li_absolute_containing_block_a.html Normal file
View file

@ -0,0 +1,19 @@
<!DOCTYPE html>
<style>
body {
font-size: 64px;
}
li {
position: relative;
}
section {
position: absolute;
content: "";
top: 0;
left: 0;
right: 0;
bottom: 0;
background: blue;
}
</style>
<li>X<section></section></li>

19
tests/ref/li_absolute_containing_block_ref.html Normal file
View file

@ -0,0 +1,19 @@
<!DOCTYPE html>
<style>
body {
font-size: 64px;
}
div {
position: relative;
}
section {
position: absolute;
content: "";
top: 0;
left: 0;
right: 0;
bottom: 0;
background: blue;
}
</style>
<div>X<section></section></div>