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

Bug 1519958 - Improve stack size of grid templates and re-enable style struct size assertions disabled in the previous patch. r=boris

Browse source 
This re-enables the assertion which was disabled on the previous patch by doing
a bit of boxing around.

Differential Revision: https://phabricator.services.mozilla.com/D36599
This commit is contained in:
Emilio Cobos Álvarez 2019-07-02 01:35:50 +02:00
parent 3e39998068
commit 708ce04896
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/properties/shorthands/position.mako.rs
View file

@ -353,8 +353,11 @@
GenericGridTemplateComponent::None
};
Ok((GenericGridTemplateComponent::TrackList(template_rows),
template_cols, GridTemplateAreas::Areas(TemplateAreasArc(Arc::new(template_areas)))))
Ok((
GenericGridTemplateComponent::TrackList(Box::new(template_rows)),
template_cols,
GridTemplateAreas::Areas(TemplateAreasArc(Arc::new(template_areas)))
))
} else {
let mut template_rows = GridTemplateComponent::parse(context, input)?;
if let GenericGridTemplateComponent::TrackList(ref mut list) = template_rows {

4
components/style/values/generics/grid.rs
View file

@ -710,12 +710,12 @@ pub enum GenericGridTemplateComponent<L, I> {
#[compute(field_bound)]
#[resolve(field_bound)]
#[shmem(field_bound)]
GenericTrackList<L, I>,
Box<GenericTrackList<L, I>>,
),
/// A `subgrid <line-name-list>?`
/// TODO: Support animations for this after subgrid is addressed in [grid-2] spec.
#[animation(error)]
Subgrid(LineNameList),
Subgrid(Box<LineNameList>),
}
pub use self::GenericGridTemplateComponent as GridTemplateComponent;

5
components/style/values/specified/grid.rs
View file

@ -321,10 +321,11 @@ impl GridTemplateComponent<LengthPercentage, Integer> {
) -> Result<Self, ParseError<'i>> {
if allow_grid_template_subgrids() {
if let Ok(t) = input.try(|i| LineNameList::parse(context, i)) {
return Ok(GridTemplateComponent::Subgrid(t));
return Ok(GridTemplateComponent::Subgrid(Box::new(t)));
}
}
TrackList::parse(context, input).map(GridTemplateComponent::TrackList)
let track_list = TrackList::parse(context, input)?;
Ok(GridTemplateComponent::TrackList(Box::new(track_list)))
}
}