Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1794040 - Simplify container-type implementation. r=dshin

Browse Source 
It was made a bitfield so that we could include style. But then style
containment was removed and the bitfield keeps causing us to do wrong
check (since INLINE_SIZE intersects SIZE).

So just make it an enum. This causes a progression and a test that
failed now times out (which is a pre-existing issue, just like the
pseudo-elements test that times out).

Differential Revision: https://phabricator.services.mozilla.com/D160371
This commit is contained in:
Emilio Cobos Álvarez 2022-10-27 10:48:58 +00:00
parent 9cbe906b70
commit dcedd55035
16 changed files with 71 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/base/nsPresContext.cpp
View File

@ -1004,11 +1004,13 @@ struct QueryContainerState {
nscoord GetInlineSize() const { return LogicalSize(mWm, mSize).ISize(mWm); }
bool Changed(const QueryContainerState& aNewState, StyleContainerType aType) {
if (aType & StyleContainerType::SIZE) {
return mSize != aNewState.mSize;
}
if (aType & StyleContainerType::INLINE_SIZE) {
return GetInlineSize() != aNewState.GetInlineSize();
switch (aType) {
case StyleContainerType::Normal:
break;
case StyleContainerType::Size:
return mSize != aNewState.mSize;
case StyleContainerType::InlineSize:
return GetInlineSize() != aNewState.GetInlineSize();
}
return false;
}
@ -1041,7 +1043,8 @@ bool nsPresContext::UpdateContainerQueryStyles() {
}
auto type = frame->StyleDisplay()->mContainerType;
MOZ_ASSERT(type, "Non-container frames shouldn't be in this type");
MOZ_ASSERT(type != StyleContainerType::Normal,
"Non-container frames shouldn't be in this type");
if (!mUpdatedContainerQueryContents.EnsureInserted(frame->GetContent())) {
continue;

4
layout/generic/nsIFrame.cpp
View File

@ -721,7 +721,7 @@ void nsIFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
AddStateBits(NS_FRAME_MAY_BE_TRANSFORMED);
}
if (disp->mContainerType) {
if (disp->mContainerType != StyleContainerType::Normal) {
PresContext()->RegisterContainerQueryFrame(this);
}
@ -811,7 +811,7 @@ void nsIFrame::DestroyFrom(nsIFrame* aDestructRoot,
}
}
if (disp->mContainerType) {
if (disp->mContainerType != StyleContainerType::Normal) {
PresContext()->UnregisterContainerQueryFrame(this);
}

2
layout/style/nsStyleStruct.cpp
View File

@ -2209,7 +2209,7 @@ nsStyleDisplay::nsStyleDisplay(const Document& aDocument)
mOriginalDisplay(StyleDisplay::Inline),
mContain(StyleContain::NONE),
mContentVisibility(StyleContentVisibility::Visible),
mContainerType(StyleContainerType::NORMAL),
mContainerType(StyleContainerType::Normal),
mAppearance(StyleAppearance::None),
mDefaultAppearance(StyleAppearance::None),
mPosition(StylePositionProperty::Static),

32
layout/style/nsStyleStruct.h
View File

@ -1705,7 +1705,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
auto contain = mContain;
// content-visibility and container-type implicitly enable some containment
// flags.
if (MOZ_LIKELY(!mContainerType) &&
if (MOZ_LIKELY(mContainerType == mozilla::StyleContainerType::Normal) &&
MOZ_LIKELY(mContentVisibility == StyleContentVisibility::Visible)) {
return contain;
}
@ -1726,18 +1726,24 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
break;
}
if (mContainerType & mozilla::StyleContainerType::SIZE) {
// https://drafts.csswg.org/css-contain-3/#valdef-container-type-size:
// Applies layout containment, style containment, and size containment
// to the principal box.
contain |= mozilla::StyleContain::LAYOUT | mozilla::StyleContain::STYLE |
mozilla::StyleContain::SIZE;
} else if (mContainerType & mozilla::StyleContainerType::INLINE_SIZE) {
// https://drafts.csswg.org/css-contain-3/#valdef-container-type-inline-size:
// Applies layout containment, style containment, and inline-size
// containment to the principal box.
contain |= mozilla::StyleContain::LAYOUT | mozilla::StyleContain::STYLE |
mozilla::StyleContain::INLINE_SIZE;
switch (mContainerType) {
case mozilla::StyleContainerType::Normal:
break;
case mozilla::StyleContainerType::InlineSize:
// https://drafts.csswg.org/css-contain-3/#valdef-container-type-inline-size:
// Applies layout containment, style containment, and inline-size
// containment to the principal box.
contain |= mozilla::StyleContain::LAYOUT |
mozilla::StyleContain::STYLE |
mozilla::StyleContain::INLINE_SIZE;
break;
case mozilla::StyleContainerType::Size:
// https://drafts.csswg.org/css-contain-3/#valdef-container-type-size:
// Applies layout containment, style containment, and size
// containment to the principal box.
contain |= mozilla::StyleContain::LAYOUT |
mozilla::StyleContain::STYLE | mozilla::StyleContain::SIZE;
break;
}
return contain;

2
servo/components/style/matching.rs
View File

@ -907,7 +907,7 @@ pub trait MatchMethods: TElement {
let is_container = !new_primary_style
.get_box()
.clone_container_type()
.is_empty();
.is_normal();
if is_root || is_container {
let new_font_size = new_primary_style.get_font().clone_font_size();
let old_font_size = old_styles

2
servo/components/style/properties/longhands/box.mako.rs
View File

@ -445,7 +445,7 @@ ${helpers.predefined_type(
${helpers.predefined_type(
"container-type",
"ContainerType",
"computed::ContainerType::NORMAL",
"computed::ContainerType::Normal",
engines="gecko",
animation_value_type="none",
gecko_pref="layout.css.container-queries.enabled",

8
servo/components/style/properties/shorthands/box.mako.rs
View File

@ -40,19 +40,19 @@ ${helpers.two_properties_shorthand(
gecko_pref="layout.css.container-queries.enabled",
spec="https://drafts.csswg.org/css-contain-3/#container-shorthand"
>
use crate::values::specified::box_::{ContainerName, ContainerType};
pub fn parse_value<'i>(
context: &ParserContext,
input: &mut Parser<'i, '_>,
) -> Result<Longhands, ParseError<'i>> {
use crate::parser::Parse;
use crate::values::specified::box_::{ContainerName, ContainerType};
// See https://github.com/w3c/csswg-drafts/issues/7180 for why we don't
// match the spec.
let container_name = ContainerName::parse(context, input)?;
let container_type = if input.try_parse(|input| input.expect_delim('/')).is_ok() {
ContainerType::parse(context, input)?
ContainerType::parse(input)?
} else {
ContainerType::NORMAL
ContainerType::Normal
};
Ok(expanded! {
container_name: container_name,
@ -63,7 +63,7 @@ ${helpers.two_properties_shorthand(
impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result where W: fmt::Write {
self.container_name.to_css(dest)?;
if !self.container_type.is_empty() {
if !self.container_type.is_normal() {
dest.write_str(" / ")?;
self.container_type.to_css(dest)?;
}

28
servo/components/style/stylesheets/container_rule.rs
View File

@ -114,18 +114,18 @@ pub struct ContainerLookupResult<E> {
}
fn container_type_axes(ty_: ContainerType, wm: WritingMode) -> FeatureFlags {
if ty_.contains(ContainerType::SIZE) {
return FeatureFlags::all_container_axes();
match ty_ {
ContainerType::Size => FeatureFlags::all_container_axes(),
ContainerType::InlineSize => {
let physical_axis = if wm.is_vertical() {
FeatureFlags::CONTAINER_REQUIRES_HEIGHT_AXIS
} else {
FeatureFlags::CONTAINER_REQUIRES_WIDTH_AXIS
};
FeatureFlags::CONTAINER_REQUIRES_INLINE_AXIS | physical_axis
},
ContainerType::Normal => FeatureFlags::empty(),
}
if ty_.contains(ContainerType::INLINE_SIZE) {
let physical_axis = if wm.is_vertical() {
FeatureFlags::CONTAINER_REQUIRES_HEIGHT_AXIS
} else {
FeatureFlags::CONTAINER_REQUIRES_WIDTH_AXIS
};
return FeatureFlags::CONTAINER_REQUIRES_INLINE_AXIS | physical_axis;
}
FeatureFlags::empty()
}
enum TraversalResult<T> {
@ -476,7 +476,7 @@ impl<'a> ContainerSizeQuery<'a> {
let container_type = box_style.clone_container_type();
let size = e.primary_box_size();
match container_type {
ContainerType::SIZE => {
ContainerType::Size=> {
TraversalResult::Done(
ContainerSizeQueryResult {
width: Some(size.width),
@ -484,7 +484,7 @@ impl<'a> ContainerSizeQuery<'a> {
}
)
},
ContainerType::INLINE_SIZE => {
ContainerType::InlineSize => {
if wm.is_horizontal() {
TraversalResult::Done(
ContainerSizeQueryResult {
@ -501,7 +501,7 @@ impl<'a> ContainerSizeQuery<'a> {
)
}
},
_ => TraversalResult::InProgress,
ContainerType::Normal => TraversalResult::InProgress,
}
}

38
servo/components/style/values/specified/box.rs
View File

@ -1515,30 +1515,28 @@ pub enum ContentVisibility {
Visible,
}
bitflags! {
#[derive(MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToCss, Parse, ToResolvedValue, ToShmem)]
#[repr(C)]
#[allow(missing_docs)]
#[css(bitflags(single="normal", mixed="size,inline-size", overlapping_bits))]
/// https://drafts.csswg.org/css-contain-3/#container-type
///
/// TODO: block-size is on the spec but it seems it was removed? WPTs don't
/// support it, see https://github.com/w3c/csswg-drafts/issues/7179.
pub struct ContainerType: u8 {
/// The `normal` variant.
const NORMAL = 0;
/// The `inline-size` variant.
const INLINE_SIZE = 1 << 0;
/// The `size` variant, exclusive with `inline-size` (they sharing bits
/// guarantees this).
const SIZE = 1 << 1 | Self::INLINE_SIZE.bits;
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToCss, Parse, ToResolvedValue, ToShmem)]
#[repr(u8)]
#[allow(missing_docs)]
/// https://drafts.csswg.org/css-contain-3/#container-type
pub enum ContainerType {
/// The `normal` variant.
Normal,
/// The `inline-size` variant.
InlineSize,
/// The `size` variant.
Size,
}
impl ContainerType {
/// Is this container-type: normal?
pub fn is_normal(self) -> bool {
self == Self::Normal
}
/// Is this type containing size in any way?
pub fn is_size_container_type(&self) -> bool {
self.intersects(ContainerType::SIZE | ContainerType::INLINE_SIZE)
pub fn is_size_container_type(self) -> bool {
!self.is_normal()
}
}

5
testing/web-platform/meta/css/css-contain/container-queries/container-type-containment.html.ini
View File

@ -1,8 +1,3 @@
[container-type-containment.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[container-type:inline-size turns on inline-size containment]
expected: FAIL
[container-type:inline/size turns on style containment]
expected: FAIL

2
testing/web-platform/meta/css/css-contain/container-queries/fieldset-legend-change.html.ini
View File

@ -1,2 +0,0 @@
[fieldset-legend-change.html]
expected: FAIL

5
testing/web-platform/meta/css/css-contain/container-queries/fragmented-container-001.html.ini
View File

@ -1,5 +0,0 @@
[fragmented-container-001.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[Children of fragmented inline-size container should match inline-size of first fragment]
expected: FAIL

2
testing/web-platform/meta/css/css-contain/container-queries/inline-size-bfc-floats.html.ini
View File

@ -1,2 +1,2 @@
[inline-size-bfc-floats.html]
expected: FAIL
expected: TIMEOUT

5
testing/web-platform/meta/css/css-contain/container-queries/inline-size-containment-vertical-rl.html.ini
View File

@ -1,5 +0,0 @@
[inline-size-containment-vertical-rl.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[inline-size containment only]
expected: FAIL

5
testing/web-platform/meta/css/css-contain/container-queries/inline-size-containment.html.ini
View File

@ -1,5 +0,0 @@
[inline-size-containment.html]
expected:
if (os == "android") and fission: [OK, TIMEOUT]
[inline-size containment only]
expected: FAIL

5
testing/web-platform/meta/css/css-contain/container-queries/percentage-padding-orthogonal.html.ini
View File

@ -10,8 +10,5 @@
[#container width 400px after padding is applied. #second is removed from the rendering]
expected: FAIL
[#container height measured with 499px width. Both container children visible]
expected: FAIL
[#container width 399x after padding is applied. #second is removed from the rendering]
[#container width 399px after padding is applied. #second is removed from the rendering]
expected: FAIL