mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Uncomment more stuff related to box construction
This commit is contained in:
Anthony Ramine
parent
c08cfbb5f3
commit
9cef3eee65
4 changed files with 226 additions and 202 deletions
|
|
@ -2,7 +2,25 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use super::*;
|
||||
use crate::dom_traversal::{Contents, NodeExt};
|
||||
use crate::flow::construct::ContainsFloats;
|
||||
use crate::flow::float::FloatBox;
|
||||
use crate::flow::{BlockContainer, BlockFormattingContext, BlockLevelBox};
|
||||
use crate::fragments::Fragment;
|
||||
use crate::geom;
|
||||
use crate::geom::flow_relative::Vec2;
|
||||
use crate::positioned::AbsolutelyPositionedBox;
|
||||
use crate::replaced::ReplacedContent;
|
||||
use crate::style_ext::{
|
||||
Direction, Display, DisplayGeneratingBox, DisplayInside, DisplayOutside, WritingMode,
|
||||
};
|
||||
use crate::{ContainingBlock, DefiniteContainingBlock, IndependentFormattingContext};
|
||||
use rayon::iter::{IntoParallelRefIterator, ParallelExtend, ParallelIterator};
|
||||
use servo_arc::Arc;
|
||||
use style::context::SharedStyleContext;
|
||||
use style::properties::ComputedValues;
|
||||
use style::values::computed::{Length, LengthOrAuto};
|
||||
use style_traits::CSSPixel;
|
||||
|
||||
// FIXME
|
||||
// impl crate::dom::Document {
|
||||
|
|
@ -16,114 +34,107 @@ use super::*;
|
|||
|
||||
struct BoxTreeRoot(BlockFormattingContext);
|
||||
|
||||
// FIXME
|
||||
// impl BoxTreeRoot {
|
||||
// pub fn construct(document: &dom::Document) -> Self {
|
||||
// let author_styles = &document.parse_stylesheets();
|
||||
// let context = Context {
|
||||
// document,
|
||||
// author_styles,
|
||||
// };
|
||||
// let root_element = document.root_element();
|
||||
// let style = style_for_element(context.author_styles, context.document, root_element, None);
|
||||
// let (contains_floats, boxes) = construct_for_root_element(&context, root_element, style);
|
||||
// Self(BlockFormattingContext {
|
||||
// contains_floats: contains_floats == ContainsFloats::Yes,
|
||||
// contents: BlockContainer::BlockLevelBoxes(boxes),
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
impl BoxTreeRoot {
|
||||
pub fn construct<'dom>(
|
||||
context: &SharedStyleContext<'_>,
|
||||
root_element: impl NodeExt<'dom>,
|
||||
) -> Self {
|
||||
let (contains_floats, boxes) = construct_for_root_element(&context, root_element);
|
||||
Self(BlockFormattingContext {
|
||||
contains_floats: contains_floats == ContainsFloats::Yes,
|
||||
contents: BlockContainer::BlockLevelBoxes(boxes),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// fn construct_for_root_element(
|
||||
// context: &Context,
|
||||
// root_element: dom::NodeId,
|
||||
// style: Arc<ComputedValues>,
|
||||
// ) -> (ContainsFloats, Vec<Arc<BlockLevelBox>>) {
|
||||
// let replaced = ReplacedContent::for_element(root_element, context);
|
||||
fn construct_for_root_element<'dom>(
|
||||
context: &SharedStyleContext<'_>,
|
||||
root_element: impl NodeExt<'dom>,
|
||||
) -> (ContainsFloats, Vec<Arc<BlockLevelBox>>) {
|
||||
let style = root_element.style(context);
|
||||
let replaced = ReplacedContent::for_element(root_element, context);
|
||||
let box_style = style.get_box();
|
||||
|
||||
// let display_inside = match style.box_.display {
|
||||
// Display::None => return (ContainsFloats::No, Vec::new()),
|
||||
// Display::Contents if replaced.is_some() => {
|
||||
// // 'display: contents' computes to 'none' for replaced elements
|
||||
// return (ContainsFloats::No, Vec::new());
|
||||
// }
|
||||
// // https://drafts.csswg.org/css-display-3/#transformations
|
||||
// Display::Contents => DisplayInside::Flow,
|
||||
// // The root element is blockified, ignore DisplayOutside
|
||||
// Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { inside, .. }) => inside,
|
||||
// };
|
||||
let display_inside = match Display::from(box_style.display) {
|
||||
Display::None => return (ContainsFloats::No, Vec::new()),
|
||||
Display::Contents if replaced.is_some() => {
|
||||
// 'display: contents' computes to 'none' for replaced elements
|
||||
return (ContainsFloats::No, Vec::new());
|
||||
},
|
||||
// https://drafts.csswg.org/css-display-3/#transformations
|
||||
Display::Contents => DisplayInside::Flow,
|
||||
// The root element is blockified, ignore DisplayOutside
|
||||
Display::GeneratingBox(DisplayGeneratingBox::OutsideInside { inside, .. }) => inside,
|
||||
};
|
||||
|
||||
// if let Some(replaced) = replaced {
|
||||
// let _box = match replaced {};
|
||||
// #[allow(unreachable_code)]
|
||||
// {
|
||||
// return (ContainsFloats::No, vec![Arc::new(_box)]);
|
||||
// }
|
||||
// }
|
||||
if let Some(replaced) = replaced {
|
||||
let _box = match replaced {};
|
||||
#[allow(unreachable_code)]
|
||||
{
|
||||
return (ContainsFloats::No, vec![Arc::new(_box)]);
|
||||
}
|
||||
}
|
||||
|
||||
// let contents = IndependentFormattingContext::construct(
|
||||
// context,
|
||||
// &style,
|
||||
// display_inside,
|
||||
// Contents::OfElement(root_element),
|
||||
// );
|
||||
// if style.box_.position.is_absolutely_positioned() {
|
||||
// (
|
||||
// ContainsFloats::No,
|
||||
// vec![Arc::new(BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
|
||||
// AbsolutelyPositionedBox { style, contents },
|
||||
// ))],
|
||||
// )
|
||||
// } else if style.box_.float.is_floating() {
|
||||
// (
|
||||
// ContainsFloats::Yes,
|
||||
// vec![Arc::new(BlockLevelBox::OutOfFlowFloatBox(FloatBox {
|
||||
// contents,
|
||||
// style,
|
||||
// }))],
|
||||
// )
|
||||
// } else {
|
||||
// (
|
||||
// ContainsFloats::No,
|
||||
// vec![Arc::new(BlockLevelBox::Independent { style, contents })],
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
let contents = IndependentFormattingContext::construct(
|
||||
context,
|
||||
&style,
|
||||
display_inside,
|
||||
Contents::OfElement(root_element),
|
||||
);
|
||||
if box_style.position.is_absolutely_positioned() {
|
||||
(
|
||||
ContainsFloats::No,
|
||||
vec![Arc::new(BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(
|
||||
AbsolutelyPositionedBox { style, contents },
|
||||
))],
|
||||
)
|
||||
} else if box_style.float.is_floating() {
|
||||
(
|
||||
ContainsFloats::Yes,
|
||||
vec![Arc::new(BlockLevelBox::OutOfFlowFloatBox(FloatBox {
|
||||
contents,
|
||||
style,
|
||||
}))],
|
||||
)
|
||||
} else {
|
||||
(
|
||||
ContainsFloats::No,
|
||||
vec![Arc::new(BlockLevelBox::Independent { style, contents })],
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// impl BoxTreeRoot {
|
||||
// fn layout(&self, viewport: crate::geom::Size<crate::geom::CssPx>) -> Vec<Fragment> {
|
||||
// let initial_containing_block_size = Vec2 {
|
||||
// inline: Length { px: viewport.width },
|
||||
// block: Length {
|
||||
// px: viewport.height,
|
||||
// },
|
||||
// };
|
||||
impl BoxTreeRoot {
|
||||
fn layout(&self, viewport: geom::Size<CSSPixel>) -> Vec<Fragment> {
|
||||
let initial_containing_block_size = Vec2 {
|
||||
inline: Length::new(viewport.width),
|
||||
block: Length::new(viewport.height),
|
||||
};
|
||||
|
||||
// let initial_containing_block = ContainingBlock {
|
||||
// inline_size: initial_containing_block_size.inline,
|
||||
// block_size: LengthOrAuto::Length(initial_containing_block_size.block),
|
||||
// // FIXME: use the document’s mode:
|
||||
// // https://drafts.csswg.org/css-writing-modes/#principal-flow
|
||||
// mode: (WritingMode::HorizontalTb, Direction::Ltr),
|
||||
// };
|
||||
// let dummy_tree_rank = 0;
|
||||
// let mut absolutely_positioned_fragments = vec![];
|
||||
// let mut fragments = self.0.layout(
|
||||
// &initial_containing_block,
|
||||
// &mut absolutely_positioned_fragments,
|
||||
// dummy_tree_rank,
|
||||
// &mut PlacementState::root(),
|
||||
// );
|
||||
let initial_containing_block = ContainingBlock {
|
||||
inline_size: initial_containing_block_size.inline,
|
||||
block_size: LengthOrAuto::LengthPercentage(initial_containing_block_size.block),
|
||||
// FIXME: use the document’s mode:
|
||||
// https://drafts.csswg.org/css-writing-modes/#principal-flow
|
||||
mode: (WritingMode::HorizontalTb, Direction::Ltr),
|
||||
};
|
||||
let dummy_tree_rank = 0;
|
||||
let mut absolutely_positioned_fragments = vec![];
|
||||
let mut flow_children = self.0.layout(
|
||||
&initial_containing_block,
|
||||
dummy_tree_rank,
|
||||
&mut absolutely_positioned_fragments,
|
||||
);
|
||||
|
||||
// let initial_containing_block = DefiniteContainingBlock {
|
||||
// size: initial_containing_block_size,
|
||||
// mode: initial_containing_block.mode,
|
||||
// };
|
||||
// fragments.par_extend(
|
||||
// absolutely_positioned_fragments
|
||||
// .par_iter()
|
||||
// .map(|a| a.layout(&initial_containing_block)),
|
||||
// );
|
||||
// fragments
|
||||
// }
|
||||
// }
|
||||
let initial_containing_block = DefiniteContainingBlock {
|
||||
size: initial_containing_block_size,
|
||||
mode: initial_containing_block.mode,
|
||||
};
|
||||
flow_children.fragments.par_extend(
|
||||
absolutely_positioned_fragments
|
||||
.par_iter()
|
||||
.map(|a| a.layout(&initial_containing_block)),
|
||||
);
|
||||
flow_children.fragments
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue