aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Holley <bobbyholley@gmail.com>2016-07-26 16:27:31 -0700
committerBobby Holley <bobbyholley@gmail.com>2016-07-26 16:32:50 -0700
commit2784f4448888bed1e2881898dfbcc4de78326902 (patch)
tree72f3dbe98be7137b39f9124ffc18876acba6cfea
parent6b568b49fd7169c0fe97e93909f82cb242f807cf (diff)
downloadservo-2784f4448888bed1e2881898dfbcc4de78326902.tar.gz
servo-2784f4448888bed1e2881898dfbcc4de78326902.zip
Sync anonymous box list.
This handles the changes in bug 1277131 and bug 1097499, and should allow us to remove the hacky fallback for anonymous boxes in stylo.
-rw-r--r--components/style/gecko_selector_impl.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/components/style/gecko_selector_impl.rs b/components/style/gecko_selector_impl.rs
index ed99fd39758..5798222cb07 100644
--- a/components/style/gecko_selector_impl.rs
+++ b/components/style/gecko_selector_impl.rs
@@ -44,7 +44,8 @@ pub enum PseudoElement {
// https://mxr.mozilla.org/mozilla-central/source/layout/style/nsCSSAnonBoxList.h
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum AnonBoxPseudoElement {
- MozNonElement,
+ MozText,
+ MozOtherNonElement,
MozAnonymousBlock,
MozAnonymousPositionedBlock,
MozMathMLAnonymousBlock,
@@ -67,7 +68,7 @@ pub enum AnonBoxPseudoElement {
MozTableCell,
MozTableColumnGroup,
MozTableColumn,
- MozTableOuter,
+ MozTableWrapper,
MozTableRowGroup,
MozTableRow,
@@ -214,7 +215,8 @@ impl SelectorImpl for GeckoSelectorImpl {
}
Ok(AnonBox(match_ignore_ascii_case! { name,
- "-moz-non-element" => MozNonElement,
+ "-moz-text" => MozText,
+ "-moz-other-non-element" => MozOtherNonElement,
"-moz-anonymous-block" => MozAnonymousBlock,
"-moz-anonymous-positioned-block" => MozAnonymousPositionedBlock,
@@ -240,7 +242,7 @@ impl SelectorImpl for GeckoSelectorImpl {
"-moz-table-cell" => MozTableCell,
"-moz-table-column-group" => MozTableColumnGroup,
"-moz-table-column" => MozTableColumn,
- "-moz-table-outer" => MozTableOuter,
+ "-moz-table-wrapper" => MozTableWrapper,
"-moz-table-row-group" => MozTableRowGroup,
"-moz-table-row" => MozTableRow,
@@ -305,7 +307,8 @@ impl SelectorImplExt for GeckoSelectorImpl {
fun(After);
fun(FirstLine);
- fun(AnonBox(MozNonElement));
+ fun(AnonBox(MozText));
+ fun(AnonBox(MozOtherNonElement));
fun(AnonBox(MozAnonymousBlock));
fun(AnonBox(MozAnonymousPositionedBlock));
fun(AnonBox(MozMathMLAnonymousBlock));
@@ -328,7 +331,7 @@ impl SelectorImplExt for GeckoSelectorImpl {
fun(AnonBox(MozTableCell));
fun(AnonBox(MozTableColumnGroup));
fun(AnonBox(MozTableColumn));
- fun(AnonBox(MozTableOuter));
+ fun(AnonBox(MozTableWrapper));
fun(AnonBox(MozTableRowGroup));
fun(AnonBox(MozTableRow));