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

layout: grid-template getComputedStyle cleanup (#34926)

Browse source 
* Update Taffy and WPT expectations

Signed-off-by: stevennovaryo <steven.novaryo@gmail.com>

* Rename DetailedInfo to SpecificInfo

Signed-off-by: stevennovaryo <steven.novaryo@gmail.com>

* Run fmt

Signed-off-by: stevennovaryo <steven.novaryo@gmail.com>

---------

Signed-off-by: stevennovaryo <steven.novaryo@gmail.com>
This commit is contained in:
Steven Novaryo 2025-01-10 17:04:49 +08:00 • committed by GitHub
parent c94d909a86
commit bbb255d81c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 41 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/layout_2020/taffy/layout.rs
View file

@ -13,7 +13,7 @@ use taffy::style_helpers::{TaffyMaxContent, TaffyMinContent};
use taffy::{AvailableSpace, MaybeMath, RequestedAxis, RunMode};
use super::{
DetailedTaffyGridInfo, TaffyContainer, TaffyItemBox, TaffyItemBoxInner, TaffyStyloStyle,
SpecificTaffyGridInfo, TaffyContainer, TaffyItemBox, TaffyItemBoxInner, TaffyStyloStyle,
};
use crate::cell::ArcRefCell;
use crate::context::LayoutContext;
@ -21,7 +21,7 @@ use crate::formatting_contexts::{
Baselines, IndependentFormattingContext, IndependentFormattingContextContents,
IndependentLayout,
};
use crate::fragment_tree::{BoxFragment, CollapsedBlockMargins, DetailedLayoutInfo, Fragment};
use crate::fragment_tree::{BoxFragment, CollapsedBlockMargins, Fragment, SpecificLayoutInfo};
use crate::geom::{
LogicalSides, LogicalVec2, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, Size,
SizeConstraint, Sizes,
@ -66,10 +66,10 @@ struct TaffyContainerContext<'a> {
positioning_context: &'a mut PositioningContext,
content_box_size_override: &'a ContainingBlock<'a>,
style: &'a ComputedValues,
detailed_layout_info: Option<DetailedLayoutInfo>,
detailed_layout_info: Option<SpecificLayoutInfo>,
/// Temporary location for children detailed info, which will be moved into child fragments
child_detailed_layout_infos: Vec<Option<DetailedLayoutInfo>>,
child_detailed_layout_infos: Vec<Option<SpecificLayoutInfo>>,
}
struct ChildIter(std::ops::Range<usize>);
@ -328,8 +328,8 @@ impl taffy::LayoutGridContainer for TaffyContainerContext<'_> {
_node_id: taffy::NodeId,
detailed_layout_info: taffy::DetailedGridInfo,
) {
self.detailed_layout_info = Some(DetailedLayoutInfo::Grid(Box::new(
DetailedTaffyGridInfo::from_detailed_grid_layout(detailed_layout_info),
self.detailed_layout_info = Some(SpecificLayoutInfo::Grid(Box::new(
SpecificTaffyGridInfo::from_detailed_grid_layout(detailed_layout_info),
)));
}
}
@ -546,7 +546,7 @@ impl TaffyContainer {
.map(Au::from_f32_px),
);
let child_detailed_layout_info: Option<DetailedLayoutInfo> =
let child_detailed_layout_info: Option<SpecificLayoutInfo> =
std::mem::take(&mut container_ctx.child_detailed_layout_infos[child_id]);
match &mut child.taffy_level_box {

14
components/layout_2020/taffy/mod.rs
View file

@ -121,15 +121,15 @@ impl TaffyItemBox {
/// Details from Taffy grid layout that will be stored
#[derive(Clone, Debug)]
pub(crate) struct DetailedTaffyGridInfo {
pub rows: DetailedTaffyGridTrackInfo,
pub columns: DetailedTaffyGridTrackInfo,
pub(crate) struct SpecificTaffyGridInfo {
pub rows: SpecificTaffyGridTrackInfo,
pub columns: SpecificTaffyGridTrackInfo,
}
impl DetailedTaffyGridInfo {
impl SpecificTaffyGridInfo {
fn from_detailed_grid_layout(grid_info: taffy::DetailedGridInfo) -> Self {
Self {
rows: DetailedTaffyGridTrackInfo {
rows: SpecificTaffyGridTrackInfo {
sizes: grid_info
.rows
.sizes
@ -137,7 +137,7 @@ impl DetailedTaffyGridInfo {
.map(|size| Au::from_f32_px(*size))
.collect(),
},
columns: DetailedTaffyGridTrackInfo {
columns: SpecificTaffyGridTrackInfo {
sizes: grid_info
.columns
.sizes
@ -150,6 +150,6 @@ impl DetailedTaffyGridInfo {
}
#[derive(Clone, Debug)]
pub(crate) struct DetailedTaffyGridTrackInfo {
pub(crate) struct SpecificTaffyGridTrackInfo {
pub sizes: Box<[Au]>,
}