Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add content sizes computation for block containers

Browse source
This commit is contained in:
Simon Sapin 2019-12-03 02:03:51 +01:00
parent 78bfa45eab
commit 303b36f17b
3 changed files with 73 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout_2020/flow/inline.rs
View file

@ -10,7 +10,7 @@ use crate::fragments::CollapsedBlockMargins;
use crate::fragments::{AnonymousFragment, BoxFragment, Fragment, TextFragment};
use crate::geom::flow_relative::{Rect, Sides, Vec2};
use crate::positioned::{AbsolutelyPositionedBox, AbsolutelyPositionedFragment};
use crate::sizing::{outer_inline_content_sizes, ContentSizes};
use crate::sizing::{outer_inline_content_sizes_and_percentages, ContentSizes};
use crate::style_ext::{ComputedValuesExt, Display, DisplayGeneratingBox, DisplayOutside};
use crate::{relative_adjustement, ContainingBlock};
use app_units::Au;
@ -148,14 +148,11 @@ impl InlineFormattingContext {
},
InlineLevelBox::Atomic(atomic) => {
let inner = || {
// atomic
// .inline_content_sizes
// .as_ref()
// .expect("Accessing content size that was not requested")
// .clone()
// &atomic.inline_content_sizes
todo!()
};
let (outer, pc) = outer_inline_content_sizes(&atomic.style, &inner);
let (outer, pc) = outer_inline_content_sizes_and_percentages(
&atomic.style, inner());
self.current_line.min_content += outer.min_content;
self.current_line.max_content += outer.max_content;
self.current_line_percentages += pc;