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

layout: Inline {default,natural}_{inline,block}_size methods (#38276)

Browse source 
They only had one caller.

Testing: Unnecessary (no behavior change)

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-07-26 19:40:01 +02:00 • committed by GitHub
parent bc71fb8c0d
commit 9614fb997a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

54
components/layout/replaced.rs
View file

@ -414,54 +414,17 @@ impl ReplacedContents {
AspectRatio::from_content_ratio(2.0) AspectRatio::from_content_ratio(2.0)
} }
/// The default object size in the inline axis.
/// <https://drafts.csswg.org/css-images-3/#default-object-size>
pub(crate) fn default_inline_size(writing_mode: WritingMode) -> Au {
if writing_mode.is_horizontal() {
Au::from_px(300)
} else {
Au::from_px(150)
}
}
/// The default object size in the block axis.
/// <https://drafts.csswg.org/css-images-3/#default-object-size>
pub(crate) fn default_block_size(writing_mode: WritingMode) -> Au {
if writing_mode.is_horizontal() {
Au::from_px(150)
} else {
Au::from_px(300)
}
}
/// The natural size in the inline axis.
/// <https://drafts.csswg.org/css-images-3/#natural-dimensions>
pub(crate) fn natural_inline_size(&self, writing_mode: WritingMode) -> Option<Au> {
if writing_mode.is_horizontal() {
self.natural_size.width
} else {
self.natural_size.height
}
}
/// The natural size in the block axis.
/// <https://drafts.csswg.org/css-images-3/#natural-dimensions>
pub(crate) fn natural_block_size(&self, writing_mode: WritingMode) -> Option<Au> {
if writing_mode.is_horizontal() {
self.natural_size.height
} else {
self.natural_size.width
}
}
/// The inline size that would result from combining the natural size /// The inline size that would result from combining the natural size
/// and the default object size, but disregarding the specified size. /// and the default object size, but disregarding the specified size.
/// <https://drafts.csswg.org/css-images-3/#natural-dimensions> /// <https://drafts.csswg.org/css-images-3/#natural-dimensions>
/// <https://drafts.csswg.org/css-images-3/#default-object-size> /// <https://drafts.csswg.org/css-images-3/#default-object-size>
/// <https://drafts.csswg.org/css-images-3/#specified-size> /// <https://drafts.csswg.org/css-images-3/#specified-size>
pub(crate) fn fallback_inline_size(&self, writing_mode: WritingMode) -> Au { pub(crate) fn fallback_inline_size(&self, writing_mode: WritingMode) -> Au {
self.natural_inline_size(writing_mode) if writing_mode.is_horizontal() {
.unwrap_or_else(|| Self::default_inline_size(writing_mode)) self.natural_size.width.unwrap_or_else(|| Au::from_px(300))
} else {
self.natural_size.height.unwrap_or_else(|| Au::from_px(150))
}
} }
/// The block size that would result from combining the natural size /// The block size that would result from combining the natural size
@ -470,8 +433,11 @@ impl ReplacedContents {
/// <https://drafts.csswg.org/css-images-3/#default-object-size> /// <https://drafts.csswg.org/css-images-3/#default-object-size>
/// <https://drafts.csswg.org/css-images-3/#specified-size> /// <https://drafts.csswg.org/css-images-3/#specified-size>
pub(crate) fn fallback_block_size(&self, writing_mode: WritingMode) -> Au { pub(crate) fn fallback_block_size(&self, writing_mode: WritingMode) -> Au {
self.natural_block_size(writing_mode) if writing_mode.is_horizontal() {
.unwrap_or_else(|| Self::default_block_size(writing_mode)) self.natural_size.height.unwrap_or_else(|| Au::from_px(150))
} else {
self.natural_size.width.unwrap_or_else(|| Au::from_px(300))
}
} }
#[inline] #[inline]