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

style: Move CSS pseudo-element atoms to nsGkAtoms.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D3283
This commit is contained in:
Cameron McCormack 2018-08-15 15:46:00 +10:00 • committed by Emilio Cobos Álvarez
parent cc3c059bfc
commit 99a292dd6d
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,14 +28,14 @@ def gnu_symbolify(source, ident):
return "_ZN{}{}{}{}E".format(len(source.CLASS), source.CLASS, len(ident), ident)
def msvc64_symbolify(source, ident):
return "?{}@{}@@2PEAV{}@@EA".format(ident, source.CLASS, source.TYPE)
def msvc64_symbolify(source, ident, ty):
return "?{}@{}@@2PEAV{}@@EA".format(ident, source.CLASS, ty)
def msvc32_symbolify(source, ident):
def msvc32_symbolify(source, ident, ty):
# Prepend "\x01" to avoid LLVM prefixing the mangled name with "_".
# See https://github.com/rust-lang/rust/issues/36097
return "\\x01?{}@{}@@2PAV{}@@A".format(ident, source.CLASS, source.TYPE)
return "\\x01?{}@{}@@2PAV{}@@A".format(ident, source.CLASS, ty)
class GkAtomSource:
@ -46,16 +46,6 @@ class GkAtomSource:
TYPE = "nsStaticAtom"
class CSSPseudoElementsAtomSource:
PATTERN = re.compile('^(CSS_PSEUDO_ELEMENT)\(([^,]*),[^"]*"([^"]*)",()',
re.MULTILINE)
FILE = "include/nsCSSPseudoElementList.h"
CLASS = "nsCSSPseudoElements"
# NB: nsICSSPseudoElement is effectively the same as a nsStaticAtom, but we need
# this for MSVC name mangling.
TYPE = "nsICSSPseudoElement"
class CSSAnonBoxesAtomSource:
PATTERN = re.compile('^(CSS_ANON_BOX|CSS_NON_INHERITING_ANON_BOX|CSS_WRAPPER_ANON_BOX)\(([^,]*),[^"]*"([^"]*)"()\)', # NOQA: E501
re.MULTILINE)
@ -66,7 +56,6 @@ class CSSAnonBoxesAtomSource:
SOURCES = [
GkAtomSource,
CSSPseudoElementsAtomSource,
CSSAnonBoxesAtomSource,
]
@ -86,6 +75,11 @@ class Atom:
self.source = source
self.macro = macro_name
self.ty = ty
if self.is_pseudo():
if self.is_non_anon_box_pseudo():
self.pseudo_ident = (ident.split("_", 1))[1]
else:
self.pseudo_ident = ident
if self.is_anon_box():
assert self.is_inheriting_anon_box() or self.is_non_inheriting_anon_box()
@ -96,16 +90,22 @@ class Atom:
return gnu_symbolify(self.source, self.original_ident)
def msvc32_symbol(self):
return msvc32_symbolify(self.source, self.original_ident)
return msvc32_symbolify(self.source, self.original_ident, self.ty)
def msvc64_symbol(self):
return msvc64_symbolify(self.source, self.original_ident)
return msvc64_symbolify(self.source, self.original_ident, self.ty)
def type(self):
return self.ty
def capitalized(self):
return self.original_ident[0].upper() + self.original_ident[1:]
def capitalized_pseudo(self):
return self.pseudo_ident[0].upper() + self.pseudo_ident[1:]
def is_pseudo(self):
return self.is_non_anon_box_pseudo() or self.is_anon_box()
def is_non_anon_box_pseudo(self):
return self.type() == "nsICSSPseudoElement"
def is_anon_box(self):
return self.type() == "nsICSSAnonBoxPseudo"