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

Fix min/max-content of replaced boxes

Browse source
This commit is contained in:
Simon Sapin 2019-12-07 22:04:41 +01:00
parent 8996be3c5e
commit 80b2b5fb5e
2 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/layout_2020/formatting_contexts.rs
View file

@ -59,31 +59,30 @@ impl IndependentFormattingContext {
contents: Contents<impl NodeExt<'dom>>,
content_sizes: ContentSizesRequest,
) -> Self {
use self::IndependentFormattingContextContents as Contents;
let (contents, content_sizes) = match contents.try_into() {
match contents.try_into() {
Ok(non_replaced) => match display_inside {
DisplayInside::Flow | DisplayInside::FlowRoot => {
let (bfc, box_content_sizes) = BlockFormattingContext::construct(
let (bfc, content_sizes) = BlockFormattingContext::construct(
context,
&style,
non_replaced,
content_sizes,
);
(Contents::Flow(bfc), box_content_sizes)
Self {
style,
content_sizes,
contents: IndependentFormattingContextContents::Flow(bfc),
}
},
},
Err(replaced) => {
// The `content_sizes` field is not used by layout code:
(
Contents::Replaced(replaced),
BoxContentSizes::NoneWereRequested,
)
},
};
let content_sizes = content_sizes.compute(|| replaced.inline_content_sizes(&style));
Self {
style,
contents,
content_sizes,
contents: IndependentFormattingContextContents::Replaced(replaced),
}
},
}
}

51
components/layout_2020/replaced.rs
View file

@ -6,6 +6,7 @@ use crate::dom_traversal::NodeExt;
use crate::fragments::{Fragment, ImageFragment};
use crate::geom::flow_relative::{Rect, Vec2};
use crate::geom::physical;
use crate::sizing::ContentSizes;
use crate::style_ext::ComputedValuesExt;
use crate::ContainingBlock;
use net_traits::image::base::Image;
@ -63,6 +64,41 @@ impl ReplacedContent {
None
}
fn flow_relative_intrinsic_size(&self, style: &ComputedValues) -> Vec2<Option<Length>> {
let intrinsic_size = physical::Vec2 {
x: self.intrinsic_width,
y: self.intrinsic_height,
};
intrinsic_size.size_to_flow_relative(style.writing_mode)
}
fn inline_size_over_block_size_intrinsic_ratio(
&self,
style: &ComputedValues,
) -> Option<CSSFloat> {
self.intrinsic_ratio.map(|width_over_height| {
if style.writing_mode.is_vertical() {
1. / width_over_height
} else {
width_over_height
}
})
}
pub fn inline_content_sizes(&self, style: &ComputedValues) -> ContentSizes {
// FIXME: min/max-content of replaced elements is not defined in
// https://dbaron.org/css/intrinsic/
// This seems sensible?
let inline = self
.flow_relative_intrinsic_size(style)
.inline
.unwrap_or(Length::zero());
ContentSizes {
min_content: inline,
max_content: inline,
}
}
pub fn make_fragments<'a>(
&'a self,
style: &ServoArc<ComputedValues>,
@ -95,19 +131,8 @@ impl ReplacedContent {
style: &ComputedValues,
) -> Vec2<Length> {
let mode = style.writing_mode;
let intrinsic_size = physical::Vec2 {
x: self.intrinsic_width,
y: self.intrinsic_height,
};
let intrinsic_size = intrinsic_size.size_to_flow_relative(mode);
let intrinsic_ratio = self.intrinsic_ratio.map(|width_over_height| {
// inline-size over block-size
if style.writing_mode.is_vertical() {
1. / width_over_height
} else {
width_over_height
}
});
let intrinsic_size = self.flow_relative_intrinsic_size(style);
let intrinsic_ratio = self.inline_size_over_block_size_intrinsic_ratio(style);
let box_size = style.box_size().percentages_relative_to(containing_block);
let min_box_size = style