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

stylo: Fix PseudoElement::pseudo_type.

Browse source 
MozReview-Commit-ID: DH2Pv52ankl
This commit is contained in:
Emilio Cobos Álvarez 2017-07-18 14:44:25 +02:00
parent e57ed3d42f
commit 6b8649e012
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/gecko/pseudo_element_definition.mako.rs
View file

@ -111,13 +111,20 @@ impl PseudoElement {
/// Construct a `CSSPseudoElementType` from a pseudo-element /// Construct a `CSSPseudoElementType` from a pseudo-element
#[inline] #[inline]
pub fn pseudo_type(&self) -> CSSPseudoElementType { pub fn pseudo_type(&self) -> CSSPseudoElementType {
use gecko_bindings::structs::CSSPseudoElementType_InheritingAnonBox;
match *self { match *self {
% for pseudo in PSEUDOS: % for pseudo in PSEUDOS:
% if not pseudo.is_anon_box(): % if not pseudo.is_anon_box():
PseudoElement::${pseudo.capitalized()} => CSSPseudoElementType::${pseudo.original_ident}, PseudoElement::${pseudo.capitalized()} => CSSPseudoElementType::${pseudo.original_ident},
% elif pseudo.is_tree_pseudo_element():
PseudoElement::${pseudo.capitalized()}(..) => CSSPseudoElementType_InheritingAnonBox,
% elif pseudo.is_inheriting_anon_box():
PseudoElement::${pseudo.capitalized()} => CSSPseudoElementType_InheritingAnonBox,
% else:
PseudoElement::${pseudo.capitalized()} => CSSPseudoElementType::NonInheritingAnonBox,
% endif % endif
% endfor % endfor
_ => CSSPseudoElementType::NotPseudo
} }
} }

19
components/style/gecko/regen_atoms.py
View file

@ -39,14 +39,14 @@ def msvc32_symbolify(source, ident):
class GkAtomSource: class GkAtomSource:
PATTERN = re.compile('^GK_ATOM\((.+),\s*"(.*)"\)') PATTERN = re.compile('^(GK_ATOM)\((.+),\s*"(.*)"\)')
FILE = "include/nsGkAtomList.h" FILE = "include/nsGkAtomList.h"
CLASS = "nsGkAtoms" CLASS = "nsGkAtoms"
TYPE = "nsIAtom" TYPE = "nsIAtom"
class CSSPseudoElementsAtomSource: class CSSPseudoElementsAtomSource:
PATTERN = re.compile('^CSS_PSEUDO_ELEMENT\((.+),\s*"(.*)",') PATTERN = re.compile('^(CSS_PSEUDO_ELEMENT)\((.+),\s*"(.*)",')
FILE = "include/nsCSSPseudoElementList.h" FILE = "include/nsCSSPseudoElementList.h"
CLASS = "nsCSSPseudoElements" CLASS = "nsCSSPseudoElements"
# NB: nsICSSPseudoElement is effectively the same as a nsIAtom, but we need # NB: nsICSSPseudoElement is effectively the same as a nsIAtom, but we need
@ -55,7 +55,7 @@ class CSSPseudoElementsAtomSource:
class CSSAnonBoxesAtomSource: class CSSAnonBoxesAtomSource:
PATTERN = re.compile('^(?:CSS_ANON_BOX|CSS_NON_INHERITING_ANON_BOX)\((.+),\s*"(.*)"\)') PATTERN = re.compile('^(CSS_ANON_BOX|CSS_NON_INHERITING_ANON_BOX)\((.+),\s*"(.*)"\)')
FILE = "include/nsCSSAnonBoxList.h" FILE = "include/nsCSSAnonBoxList.h"
CLASS = "nsCSSAnonBoxes" CLASS = "nsCSSAnonBoxes"
TYPE = "nsICSSAnonBoxPseudo" TYPE = "nsICSSAnonBoxPseudo"
@ -76,11 +76,14 @@ def map_atom(ident):
class Atom: class Atom:
def __init__(self, source, ident, value): def __init__(self, source, macro_name, ident, value):
self.ident = "{}_{}".format(source.CLASS, ident) self.ident = "{}_{}".format(source.CLASS, ident)
self.original_ident = ident self.original_ident = ident
self.value = value self.value = value
self.source = source self.source = source
self.macro = macro_name
if self.is_anon_box():
assert self.is_inheriting_anon_box() or self.is_non_inheriting_anon_box()
def cpp_class(self): def cpp_class(self):
return self.source.CLASS return self.source.CLASS
@ -103,6 +106,12 @@ class Atom:
def is_anon_box(self): def is_anon_box(self):
return self.type() == "nsICSSAnonBoxPseudo" return self.type() == "nsICSSAnonBoxPseudo"
def is_non_inheriting_anon_box(self):
return self.macro == "CSS_NON_INHERITING_ANON_BOX"
def is_inheriting_anon_box(self):
return self.macro == "CSS_ANON_BOX"
def is_tree_pseudo_element(self): def is_tree_pseudo_element(self):
return self.value.startswith(":-moz-tree-") return self.value.startswith(":-moz-tree-")
@ -116,7 +125,7 @@ def collect_atoms(objdir):
for line in f.readlines(): for line in f.readlines():
result = re.match(source.PATTERN, line) result = re.match(source.PATTERN, line)
if result: if result:
atoms.append(Atom(source, result.group(1), result.group(2))) atoms.append(Atom(source, result.group(1), result.group(2), result.group(3)))
return atoms return atoms