aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/layout/construct.rs28
-rw-r--r--components/layout_2020/dom_traversal.rs2
-rw-r--r--components/layout_2020/flexbox/construct.rs2
-rw-r--r--components/layout_2020/flow/construct.rs4
-rw-r--r--components/style/servo/selector_parser.rs111
-rw-r--r--resources/servo.css30
-rw-r--r--tests/wpt/meta/MANIFEST.json13
-rw-r--r--tests/wpt/meta/css/css-flexbox/text-overflow-on-flexbox-001.html.ini2
-rw-r--r--tests/wpt/meta/css/css-position/sticky/position-sticky-hyperlink.html.ini2
-rw-r--r--tests/wpt/meta/css/filter-effects/filtered-inline-is-container.html.ini2
-rw-r--r--tests/wpt/tests/css/CSS2/floats/float-in-inline-anonymous-block-with-overflow-hidden.html12
11 files changed, 120 insertions, 88 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index bf1dcd2059f..ba6407f6bc0 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -805,7 +805,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoLegacyText,
&style,
);
if node_is_input_or_text_area {
@@ -813,7 +813,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoInputText,
+ &PseudoElement::ServoLegacyInputText,
&style,
)
}
@@ -1116,7 +1116,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoLegacyText,
&style,
),
node.restyle_damage(),
@@ -1133,7 +1133,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoLegacyText,
&style,
);
self.create_fragments_for_node_text_content(&mut fragments, node, &text_style)
@@ -1176,7 +1176,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoInlineBlockWrapper,
+ &PseudoElement::ServoLegacyInlineBlockWrapper,
&style,
);
let fragment_info =
@@ -1227,7 +1227,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&style_context.guards,
- &PseudoElement::ServoInlineAbsolute,
+ &PseudoElement::ServoLegacyInlineAbsolute,
&style,
);
let fragment = Fragment::from_opaque_node_and_style(
@@ -1372,7 +1372,7 @@ where
.stylist
.style_for_anonymous::<ConcreteThreadSafeLayoutNode::ConcreteElement>(
&context.guards,
- &PseudoElement::ServoTableWrapper,
+ &PseudoElement::ServoLegacyTableWrapper,
&table_style,
);
}
@@ -2189,7 +2189,7 @@ where
)));
let text_style = context.stylist.style_for_anonymous::<E>(
&context.guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoLegacyText,
&node.style,
);
@@ -2317,7 +2317,7 @@ impl Legalizer {
let mut block_wrapper = Legalizer::create_anonymous_flow::<E, _>(
context,
parent,
- &[PseudoElement::ServoAnonymousBlock],
+ &[PseudoElement::ServoLegacyAnonymousBlock],
SpecificFragmentInfo::Generic,
BlockFlow::from_fragment,
);
@@ -2378,21 +2378,21 @@ impl Legalizer {
FlowClass::TableRow => self.push_new_anonymous_flow::<E, _>(
context,
parent,
- &[PseudoElement::ServoAnonymousTableCell],
+ &[PseudoElement::ServoLegacyAnonymousTableCell],
SpecificFragmentInfo::TableCell,
TableCellFlow::from_fragment,
),
FlowClass::Table | FlowClass::TableRowGroup => self.push_new_anonymous_flow::<E, _>(
context,
parent,
- &[PseudoElement::ServoAnonymousTableRow],
+ &[PseudoElement::ServoLegacyAnonymousTableRow],
SpecificFragmentInfo::TableRow,
TableRowFlow::from_fragment,
),
FlowClass::TableWrapper => self.push_new_anonymous_flow::<E, _>(
context,
parent,
- &[PseudoElement::ServoAnonymousTable],
+ &[PseudoElement::ServoLegacyAnonymousTable],
SpecificFragmentInfo::Table,
TableFlow::from_fragment,
),
@@ -2400,8 +2400,8 @@ impl Legalizer {
context,
parent,
&[
- PseudoElement::ServoTableWrapper,
- PseudoElement::ServoAnonymousTableWrapper,
+ PseudoElement::ServoLegacyTableWrapper,
+ PseudoElement::ServoLegacyAnonymousTableWrapper,
],
SpecificFragmentInfo::TableWrapper,
TableWrapperFlow::from_fragment,
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
index 28ef473ef15..3f8da0dd190 100644
--- a/components/layout_2020/dom_traversal.rs
+++ b/components/layout_2020/dom_traversal.rs
@@ -228,7 +228,7 @@ fn traverse_pseudo_element_contents<'dom, Node>(
.stylist
.style_for_anonymous::<Node::ConcreteElement>(
&context.shared_context().guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoAnonymousBox,
&info.style,
)
});
diff --git a/components/layout_2020/flexbox/construct.rs b/components/layout_2020/flexbox/construct.rs
index c775fccd153..cc2abc6630c 100644
--- a/components/layout_2020/flexbox/construct.rs
+++ b/components/layout_2020/flexbox/construct.rs
@@ -132,7 +132,7 @@ where
.stylist
.style_for_anonymous::<Node::ConcreteElement>(
&self.context.shared_context().guards,
- &style::selector_parser::PseudoElement::ServoText,
+ &style::selector_parser::PseudoElement::ServoAnonymousBox,
&self.info.style,
),
)
diff --git a/components/layout_2020/flow/construct.rs b/components/layout_2020/flow/construct.rs
index dbdac0f5c8e..dec184b9529 100644
--- a/components/layout_2020/flow/construct.rs
+++ b/components/layout_2020/flow/construct.rs
@@ -448,7 +448,7 @@ where
.stylist
.style_for_anonymous::<Node::ConcreteElement>(
&self.context.shared_context().guards,
- &PseudoElement::ServoText, // FIMXE: use `PseudoElement::Marker` when we add it
+ &PseudoElement::ServoLegacyText, // FIMXE: use `PseudoElement::Marker` when we add it
&info.style,
);
self.handle_inline_level_element(
@@ -684,7 +684,7 @@ where
.stylist
.style_for_anonymous::<Node::ConcreteElement>(
&context.shared_context().guards,
- &PseudoElement::ServoText,
+ &PseudoElement::ServoAnonymousBox,
block_container_style,
)
});
diff --git a/components/style/servo/selector_parser.rs b/components/style/servo/selector_parser.rs
index d2488790025..7302ab43645 100644
--- a/components/style/servo/selector_parser.rs
+++ b/components/style/servo/selector_parser.rs
@@ -52,20 +52,21 @@ pub enum PseudoElement {
// Non-eager pseudos.
DetailsSummary,
DetailsContent,
- ServoText,
- ServoInputText,
- ServoTableWrapper,
- ServoAnonymousTableWrapper,
- ServoAnonymousTable,
- ServoAnonymousTableRow,
- ServoAnonymousTableCell,
- ServoAnonymousBlock,
- ServoInlineBlockWrapper,
- ServoInlineAbsolute,
+ ServoAnonymousBox,
+ ServoLegacyText,
+ ServoLegacyInputText,
+ ServoLegacyTableWrapper,
+ ServoLegacyAnonymousTableWrapper,
+ ServoLegacyAnonymousTable,
+ ServoLegacyAnonymousTableRow,
+ ServoLegacyAnonymousTableCell,
+ ServoLegacyAnonymousBlock,
+ ServoLegacyInlineBlockWrapper,
+ ServoLegacyInlineAbsolute,
}
/// The count of all pseudo-elements.
-pub const PSEUDO_COUNT: usize = PseudoElement::ServoInlineAbsolute as usize + 1;
+pub const PSEUDO_COUNT: usize = PseudoElement::ServoLegacyInlineAbsolute as usize + 1;
impl ToCss for PseudoElement {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result
@@ -79,16 +80,17 @@ impl ToCss for PseudoElement {
Selection => "::selection",
DetailsSummary => "::-servo-details-summary",
DetailsContent => "::-servo-details-content",
- ServoText => "::-servo-text",
- ServoInputText => "::-servo-input-text",
- ServoTableWrapper => "::-servo-table-wrapper",
- ServoAnonymousTableWrapper => "::-servo-anonymous-table-wrapper",
- ServoAnonymousTable => "::-servo-anonymous-table",
- ServoAnonymousTableRow => "::-servo-anonymous-table-row",
- ServoAnonymousTableCell => "::-servo-anonymous-table-cell",
- ServoAnonymousBlock => "::-servo-anonymous-block",
- ServoInlineBlockWrapper => "::-servo-inline-block-wrapper",
- ServoInlineAbsolute => "::-servo-inline-absolute",
+ ServoAnonymousBox => "::-servo-anonymous-box",
+ ServoLegacyText => "::-servo-legacy-text",
+ ServoLegacyInputText => "::-servo-legacy-input-text",
+ ServoLegacyTableWrapper => "::-servo-legacy-table-wrapper",
+ ServoLegacyAnonymousTableWrapper => "::-servo-legacy-anonymous-table-wrapper",
+ ServoLegacyAnonymousTable => "::-servo-legacy-anonymous-table",
+ ServoLegacyAnonymousTableRow => "::-servo-legacy-anonymous-table-row",
+ ServoLegacyAnonymousTableCell => "::-servo-legacy-anonymous-table-cell",
+ ServoLegacyAnonymousBlock => "::-servo-legacy-anonymous-block",
+ ServoLegacyInlineBlockWrapper => "::-servo-legacy-inline-block-wrapper",
+ ServoLegacyInlineAbsolute => "::-servo-legacy-inline-absolute",
})
}
}
@@ -225,16 +227,17 @@ impl PseudoElement {
},
PseudoElement::DetailsSummary => PseudoElementCascadeType::Lazy,
PseudoElement::DetailsContent |
- PseudoElement::ServoText |
- PseudoElement::ServoInputText |
- PseudoElement::ServoTableWrapper |
- PseudoElement::ServoAnonymousTableWrapper |
- PseudoElement::ServoAnonymousTable |
- PseudoElement::ServoAnonymousTableRow |
- PseudoElement::ServoAnonymousTableCell |
- PseudoElement::ServoAnonymousBlock |
- PseudoElement::ServoInlineBlockWrapper |
- PseudoElement::ServoInlineAbsolute => PseudoElementCascadeType::Precomputed,
+ PseudoElement::ServoAnonymousBox |
+ PseudoElement::ServoLegacyText |
+ PseudoElement::ServoLegacyInputText |
+ PseudoElement::ServoLegacyTableWrapper |
+ PseudoElement::ServoLegacyAnonymousTableWrapper |
+ PseudoElement::ServoLegacyAnonymousTable |
+ PseudoElement::ServoLegacyAnonymousTableRow |
+ PseudoElement::ServoLegacyAnonymousTableCell |
+ PseudoElement::ServoLegacyAnonymousBlock |
+ PseudoElement::ServoLegacyInlineBlockWrapper |
+ PseudoElement::ServoLegacyInlineAbsolute => PseudoElementCascadeType::Precomputed,
}
}
@@ -498,65 +501,71 @@ impl<'a, 'i> ::selectors::Parser<'i> for SelectorParser<'a> {
}
DetailsContent
},
- "-servo-text" => {
+ "-servo-anonymous-box" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoText
+ ServoAnonymousBox
},
- "-servo-input-text" => {
+ "-servo-legacy-text" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoInputText
+ ServoLegacyText
},
- "-servo-table-wrapper" => {
+ "-servo-legacy-input-text" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoTableWrapper
+ ServoLegacyInputText
},
- "-servo-anonymous-table-wrapper" => {
+ "-servo-legacy-table-wrapper" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoAnonymousTableWrapper
+ ServoLegacyTableWrapper
},
- "-servo-anonymous-table" => {
+ "-servo-legacy-anonymous-table-wrapper" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoAnonymousTable
+ ServoLegacyAnonymousTableWrapper
},
- "-servo-anonymous-table-row" => {
+ "-servo-legacy-anonymous-table" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoAnonymousTableRow
+ ServoLegacyAnonymousTable
},
- "-servo-anonymous-table-cell" => {
+ "-servo-legacy-anonymous-table-row" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoAnonymousTableCell
+ ServoLegacyAnonymousTableRow
},
- "-servo-anonymous-block" => {
+ "-servo-legacy-anonymous-table-cell" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoAnonymousBlock
+ ServoLegacyAnonymousTableCell
},
- "-servo-inline-block-wrapper" => {
+ "-servo-legacy-anonymous-block" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoInlineBlockWrapper
+ ServoLegacyAnonymousBlock
},
- "-servo-inline-absolute" => {
+ "-servo-legacy-inline-block-wrapper" => {
if !self.in_user_agent_stylesheet() {
return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
}
- ServoInlineAbsolute
+ ServoLegacyInlineBlockWrapper
+ },
+ "-servo-legacy-inline-absolute" => {
+ if !self.in_user_agent_stylesheet() {
+ return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
+ }
+ ServoLegacyInlineAbsolute
},
_ => return Err(location.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name.clone())))
diff --git a/resources/servo.css b/resources/servo.css
index ed6bc3e93dd..739e29cd488 100644
--- a/resources/servo.css
+++ b/resources/servo.css
@@ -190,27 +190,27 @@ svg > * {
* broken for stuff like table backgrounds and such. Gecko explicitly inherits
* what it wants, which seems a bit better off-hand.
*/
-*|*::-servo-anonymous-table,
-*|*::-servo-anonymous-table-wrapper,
-*|*::-servo-table-wrapper,
-*|*::-servo-anonymous-block,
-*|*::-servo-inline-block-wrapper,
-*|*::-servo-inline-absolute {
+*|*::-servo-legacy-anonymous-table,
+*|*::-servo-legacy-anonymous-table-wrapper,
+*|*::-servo-legacy-table-wrapper,
+*|*::-servo-legacy-anonymous-block,
+*|*::-servo-legacy-inline-block-wrapper,
+*|*::-servo-legacy-inline-absolute {
all: inherit;
}
/* style for text node. */
-*|*::-servo-text {
+*|*::-servo-legacy-text {
text-overflow: inherit;
overflow: inherit;
}
-*|*::-servo-table-wrapper {
+*|*::-servo-legacy-table-wrapper {
display: table;
border: none;
}
-*|*::-servo-anonymous-table-wrapper {
+*|*::-servo-legacy-anonymous-table-wrapper {
position: static;
margin: 0;
counter-increment: none;
@@ -221,7 +221,7 @@ svg > * {
overflow: visible;
}
-*|*::-servo-anonymous-table {
+*|*::-servo-legacy-anonymous-table {
display: table;
position: static;
border: none;
@@ -230,7 +230,7 @@ svg > * {
overflow: visible;
}
-*|*::-servo-anonymous-table-row {
+*|*::-servo-legacy-anonymous-table-row {
display: table-row;
position: static;
border: none;
@@ -238,7 +238,7 @@ svg > * {
overflow: visible;
}
-*|*::-servo-anonymous-table-cell {
+*|*::-servo-legacy-anonymous-table-cell {
display: table-cell;
position: static;
border: none;
@@ -246,7 +246,7 @@ svg > * {
overflow: visible;
}
-*|*::-servo-anonymous-block {
+*|*::-servo-legacy-anonymous-block {
display: block;
position: static;
border: none;
@@ -257,7 +257,7 @@ svg > * {
}
/* The outer fragment wrapper of an inline-block. */
-*|*::-servo-inline-block-wrapper {
+*|*::-servo-legacy-inline-block-wrapper {
position: static;
border: none;
padding: 0;
@@ -265,7 +265,7 @@ svg > * {
}
/* The outer fragment wrapper of an inline absolute hypothetical fragment. */
-*|*::-servo-inline-absolute {
+*|*::-servo-legacy-inline-absolute {
clip: auto;
border: none;
padding: 0;
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index a61c4b4600f..7587d13f94a 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -61432,6 +61432,19 @@
{}
]
],
+ "float-in-inline-anonymous-block-with-overflow-hidden.html": [
+ "948394e7f9b348c72a13cc64f4852a988b2fa59c",
+ [
+ null,
+ [
+ [
+ "/css/reference/ref-filled-green-100px-square.xht",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
"float-in-nested-multicol-001.html": [
"8e1a257e389d0fdc6a4a69f63b81f32378a7b944",
[
diff --git a/tests/wpt/meta/css/css-flexbox/text-overflow-on-flexbox-001.html.ini b/tests/wpt/meta/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
deleted file mode 100644
index 21a3897f188..00000000000
--- a/tests/wpt/meta/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-overflow-on-flexbox-001.html]
- expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-hyperlink.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-hyperlink.html.ini
new file mode 100644
index 00000000000..8b52a2be825
--- /dev/null
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-hyperlink.html.ini
@@ -0,0 +1,2 @@
+[position-sticky-hyperlink.html]
+ expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/filtered-inline-is-container.html.ini b/tests/wpt/meta/css/filter-effects/filtered-inline-is-container.html.ini
deleted file mode 100644
index b41a8df9ac0..00000000000
--- a/tests/wpt/meta/css/filter-effects/filtered-inline-is-container.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[filtered-inline-is-container.html]
- expected: FAIL
diff --git a/tests/wpt/tests/css/CSS2/floats/float-in-inline-anonymous-block-with-overflow-hidden.html b/tests/wpt/tests/css/CSS2/floats/float-in-inline-anonymous-block-with-overflow-hidden.html
new file mode 100644
index 00000000000..948394e7f9b
--- /dev/null
+++ b/tests/wpt/tests/css/CSS2/floats/float-in-inline-anonymous-block-with-overflow-hidden.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS Test: A float wrapped in an anonymous block should be visible within a container with overflow: hidden.</title>
+<link rel="author" href="mailto:obrufrau@igalia.com" title="Oriol Brufrau">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#anonymous-block-level" />
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="overflow: hidden; width: 100px; height: 100px; background: red">
+ <div style="height: 50px; background: green"></div>
+ <span>
+ <div style="float: left; width: 100px; height: 50px; background: green"></div>
+ </span>
+</div>
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 14:58:10 +0000