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

style: Evaluate size feature to unknown if the container lacks size containment

Browse source 
For example, inline elements may have container-type:size but they don't
support size containment, so @container(width >= 0) shouldn't match.

Differential Revision: https://phabricator.services.mozilla.com/D163936
This commit is contained in:
Oriol Brufau 2022-12-06 19:08:51 +00:00 • committed by Martin Robinson
parent 1beb9880a9
commit 0c36795e20
3 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/style/gecko/wrapper.rs
View file

@ -322,11 +322,6 @@ impl<'ln> GeckoNode<'ln> {
self.flags() & (NODE_IS_IN_SHADOW_TREE as u32) != 0
}
#[inline]
fn is_connected(&self) -> bool {
self.get_bool_flag(nsINode_BooleanFlag::IsConnected)
}
/// WARNING: This logic is duplicated in Gecko's FlattenedTreeParentIsParent.
/// Make sure to mirror any modifications in both places.
#[inline]
@ -1041,29 +1036,16 @@ impl<'le> TElement for GeckoElement<'le> {
}
#[inline]
fn primary_content_box_size(&self) -> Size2D<Option<Au>> {
if !self.as_node().is_connected() {
return Size2D::new(None, None)
}
fn query_container_size(&self) -> Size2D<Option<Au>> {
let mut width = -1;
let mut height = -1;
unsafe {
let frame = self
.0
._base
._base
._base
.__bindgen_anon_1
.mPrimaryFrame
.as_ref();
if frame.is_null() {
return Size2D::new(None, None)
}
let mut width = 0;
let mut height = 0;
bindings::Gecko_ContentSize(*frame, &mut width, &mut height);
// FIXME: Should use None if there isn't size containment.
Size2D::new(Some(Au(width)), Some(Au(height)))
bindings::Gecko_GetQueryContainerSize(self.0, &mut width, &mut height);
}
Size2D::new(
if width >= 0 { Some(Au(width)) } else { None },
if height >= 0 { Some(Au(height)) } else { None },
)
}
/// Return the list of slotted nodes of this node.