aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/layout/construct.rs26
-rw-r--r--components/layout/list_item.rs25
-rw-r--r--components/layout/table_caption.rs5
-rw-r--r--components/layout/table_cell.rs5
-rw-r--r--components/layout/table_row.rs5
-rw-r--r--components/layout/table_rowgroup.rs5
-rw-r--r--tests/ref/basic.list1
-rw-r--r--tests/ref/floated_list_item_a.html26
-rw-r--r--tests/ref/floated_list_item_ref.html24
9 files changed, 110 insertions, 12 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index 421f4e25f3f..58fe265d54d 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -860,8 +860,8 @@ impl<'a> FlowConstructor<'a> {
/// Builds a flow for a node with `display: table`. This yields a `TableWrapperFlow` with
/// possibly other `TableCaptionFlow`s or `TableFlow`s underneath it.
- fn build_flow_for_table_wrapper(&mut self, node: &ThreadSafeLayoutNode,
- float_value: float::T) -> ConstructionResult {
+ fn build_flow_for_table_wrapper(&mut self, node: &ThreadSafeLayoutNode, float_value: float::T)
+ -> ConstructionResult {
let fragment = Fragment::new_from_specific_info(node, SpecificFragmentInfo::TableWrapper);
let wrapper_flow = match float_value {
float::T::none => box TableWrapperFlow::from_node_and_fragment(node, fragment),
@@ -974,7 +974,12 @@ impl<'a> FlowConstructor<'a> {
/// Builds a flow for a node with `display: list-item`. This yields a `ListItemFlow` with
/// possibly other `BlockFlow`s or `InlineFlow`s underneath it.
- fn build_flow_for_list_item(&mut self, node: &ThreadSafeLayoutNode) -> ConstructionResult {
+ fn build_flow_for_list_item(&mut self, node: &ThreadSafeLayoutNode, flotation: float::T)
+ -> ConstructionResult {
+ let flotation = match flotation {
+ float::T::none => None,
+ flotation => Some(FloatKind::from_property(flotation)),
+ };
let marker_fragment = match node.style().get_list().list_style_image {
Some(ref url) => {
Some(Fragment::new_from_specific_info(
@@ -1012,11 +1017,17 @@ impl<'a> FlowConstructor<'a> {
let initial_fragment;
match node.style().get_list().list_style_position {
list_style_position::T::outside => {
- flow = box ListItemFlow::from_node_and_marker(self, node, marker_fragment);
+ flow = box ListItemFlow::from_node_marker_and_flotation(self,
+ node,
+ marker_fragment,
+ flotation);
initial_fragment = None;
}
list_style_position::T::inside => {
- flow = box ListItemFlow::from_node_and_marker(self, node, None);
+ flow = box ListItemFlow::from_node_marker_and_flotation(self,
+ node,
+ None,
+ flotation);
initial_fragment = marker_fragment;
}
}
@@ -1181,8 +1192,9 @@ impl<'a> PostorderNodeMutTraversal for FlowConstructor<'a> {
}
// List items contribute their own special flows.
- (display::T::list_item, _, _) => {
- node.set_flow_construction_result(self.build_flow_for_list_item(node))
+ (display::T::list_item, float_value, _) => {
+ node.set_flow_construction_result(self.build_flow_for_list_item(node,
+ float_value))
}
// Inline items that are absolutely-positioned contribute inline fragment construction
diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs
index 3c4dc8a7fc8..4c6bc9bc3b7 100644
--- a/components/layout/list_item.rs
+++ b/components/layout/list_item.rs
@@ -11,6 +11,7 @@ use block::BlockFlow;
use construct::FlowConstructor;
use context::LayoutContext;
use display_list_builder::ListItemFlowDisplayListBuilding;
+use floats::FloatKind;
use flow::{Flow, FlowClass};
use fragment::{Fragment, FragmentBorderBoxIterator};
use wrapper::ThreadSafeLayoutNode;
@@ -18,6 +19,7 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect};
use gfx::display_list::DisplayList;
use servo_util::geometry::Au;
+use servo_util::logical_geometry::LogicalRect;
use servo_util::opts;
use style::ComputedValues;
use style::computed_values::list_style_type;
@@ -34,12 +36,17 @@ pub struct ListItemFlow {
}
impl ListItemFlow {
- pub fn from_node_and_marker(constructor: &mut FlowConstructor,
- node: &ThreadSafeLayoutNode,
- marker_fragment: Option<Fragment>)
- -> ListItemFlow {
+ pub fn from_node_marker_and_flotation(constructor: &mut FlowConstructor,
+ node: &ThreadSafeLayoutNode,
+ marker_fragment: Option<Fragment>,
+ flotation: Option<FloatKind>)
+ -> ListItemFlow {
ListItemFlow {
- block_flow: BlockFlow::from_node(constructor, node),
+ block_flow: if let Some(flotation) = flotation {
+ BlockFlow::float_from_node(constructor, node, flotation)
+ } else {
+ BlockFlow::from_node(constructor, node)
+ },
marker: marker_fragment,
}
}
@@ -93,6 +100,10 @@ impl Flow for ListItemFlow {
self.block_flow.compute_absolute_position()
}
+ fn place_float_if_applicable<'a>(&mut self, layout_context: &'a LayoutContext<'a>) {
+ self.block_flow.place_float_if_applicable(layout_context)
+ }
+
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)
}
@@ -116,6 +127,10 @@ impl Flow for ListItemFlow {
self.block_flow.compute_overflow()
}
+ fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
+ self.block_flow.generated_containing_block_rect()
+ }
+
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>) {
diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs
index d45bd50e91b..17512755f87 100644
--- a/components/layout/table_caption.rs
+++ b/components/layout/table_caption.rs
@@ -15,6 +15,7 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect};
use servo_util::geometry::Au;
+use servo_util::logical_geometry::LogicalRect;
use std::fmt;
use style::ComputedValues;
use std::sync::Arc;
@@ -86,6 +87,10 @@ impl Flow for TableCaptionFlow {
self.block_flow.compute_overflow()
}
+ fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
+ self.block_flow.generated_containing_block_rect()
+ }
+
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>) {
diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs
index c80a4135f9f..dd6a74d5efd 100644
--- a/components/layout/table_cell.rs
+++ b/components/layout/table_cell.rs
@@ -17,6 +17,7 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect};
use servo_util::geometry::Au;
+use servo_util::logical_geometry::LogicalRect;
use std::fmt;
use style::{UnsignedIntegerAttribute, ComputedValues};
use std::sync::Arc;
@@ -167,6 +168,10 @@ impl Flow for TableCellFlow {
self.block_flow.compute_overflow()
}
+ fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
+ self.block_flow.generated_containing_block_rect()
+ }
+
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>) {
diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs
index eb06b31cfec..0b4f06cee4d 100644
--- a/components/layout/table_row.rs
+++ b/components/layout/table_row.rs
@@ -20,6 +20,7 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect};
use servo_util::geometry::Au;
+use servo_util::logical_geometry::LogicalRect;
use std::cmp::max;
use std::fmt;
use style::ComputedValues;
@@ -320,6 +321,10 @@ impl Flow for TableRowFlow {
self.block_flow.compute_overflow()
}
+ fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
+ self.block_flow.generated_containing_block_rect()
+ }
+
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>) {
diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs
index 00a0f23c1b5..be014330208 100644
--- a/components/layout/table_rowgroup.rs
+++ b/components/layout/table_rowgroup.rs
@@ -17,6 +17,7 @@ use wrapper::ThreadSafeLayoutNode;
use geom::{Point2D, Rect};
use servo_util::geometry::Au;
+use servo_util::logical_geometry::LogicalRect;
use std::fmt;
use style::ComputedValues;
use std::sync::Arc;
@@ -155,6 +156,10 @@ impl Flow for TableRowGroupFlow {
self.block_flow.compute_overflow()
}
+ fn generated_containing_block_rect(&self) -> LogicalRect<Au> {
+ self.block_flow.generated_containing_block_rect()
+ }
+
fn iterate_through_fragment_border_boxes(&self,
iterator: &mut FragmentBorderBoxIterator,
stacking_context_position: &Point2D<Au>) {
diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index f4097c69c36..efc0814758f 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -233,3 +233,4 @@ fragment=top != ../html/acid2.html acid2_ref.html
== filter_sepia_a.html filter_sepia_ref.html
== mix_blend_mode_a.html mix_blend_mode_ref.html
!= text_overflow_a.html text_overflow_ref.html
+== floated_list_item_a.html floated_list_item_ref.html
diff --git a/tests/ref/floated_list_item_a.html b/tests/ref/floated_list_item_a.html
new file mode 100644
index 00000000000..77e2697b639
--- /dev/null
+++ b/tests/ref/floated_list_item_a.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- Tests that list items can be floated. -->
+<style>
+ul div {
+ display: list-item;
+ float: left;
+ list-style: none;
+ margin: 0;
+}
+ul {
+ margin: 0;
+ padding: 0;
+}
+</style>
+</head>
+<body>
+<ul>
+ <div>Foo</div>
+ <div>Bar</div>
+ <div>Baz</div>
+</ul>
+</body>
+</html>
+
diff --git a/tests/ref/floated_list_item_ref.html b/tests/ref/floated_list_item_ref.html
new file mode 100644
index 00000000000..c55d0625bb0
--- /dev/null
+++ b/tests/ref/floated_list_item_ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- Tests that list items can be floated. -->
+<style>
+ul div {
+ float: left;
+ margin: 0;
+}
+ul {
+ margin: 0;
+ padding: 0;
+}
+</style>
+</head>
+<body>
+<ul>
+ <div>Foo</div>
+ <div>Bar</div>
+ <div>Baz</div>
+</ul>
+</body>
+</html>
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-03 02:09:56 +0000