Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Servo side of gecko bug 1343078: update bindinggen bits for the changes I'm making to Gecko atoms. #15843

Merged
merged 1 commit into from Mar 8, 2017
+38 −19
Merged

Servo side of gecko bug 1343078: update bindinggen bits for the changes I'm making to Gecko atoms. #15843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Loading status checks…

Update bindinggen bits for gecko bug 1343078. 

Both the set of atoms and the way they are represented in the atom list
is changing a bit.
  • Loading branch information
@bzbarsky
bzbarsky committed Mar 8, 2017
commit 9a5a26078a7d532cb4999ba4db16edd7f65a227f
2 components/style/binding_tools/regen_atoms.py
View file
Open in desktop
@@ -51,7 +51,7 @@ class CSSPseudoElementsAtomSource:


class CSSAnonBoxesAtomSource:
PATTERN = re.compile('^CSS_ANON_BOX\((.+),\s*"(.*)"\)')
PATTERN = re.compile('^(?:CSS_ANON_BOX|CSS_NON_INHERITING_ANON_BOX)\((.+),\s*"(.*)"\)')
FILE = "include/nsCSSAnonBoxList.h"
CLASS = "nsCSSAnonBoxes"
TYPE = "nsICSSAnonBoxPseudo"
7 components/style/gecko/generated/gecko_pseudo_element_helper.rs
View file
Open in desktop
@@ -103,8 +103,11 @@
pseudo_element!(":-moz-text",
atom!(":-moz-text"),
true);
pseudo_element!(":-moz-other-non-element",
atom!(":-moz-other-non-element"),
pseudo_element!(":-moz-oof-placeholder",
atom!(":-moz-oof-placeholder"),
true);
pseudo_element!(":-moz-first-letter-continuation",
atom!(":-moz-first-letter-continuation"),
true);
pseudo_element!(":-moz-anonymous-block",
atom!(":-moz-anonymous-block"),
48 components/style/gecko_string_cache/atom_macro.rs
View file
Open in desktop
@@ -2222,6 +2222,8 @@ cfg_if! {
pub static nsGkAtoms_scrollcorner: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms9scrollingE"]
pub static nsGkAtoms_scrolling: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms14scrollPositionE"]
pub static nsGkAtoms_scrollPosition: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms7sectionE"]
pub static nsGkAtoms_section: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms6selectE"]
@@ -3846,6 +3848,8 @@ cfg_if! {
pub static nsGkAtoms_onmozinterruptend: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms14ondevicechangeE"]
pub static nsGkAtoms_ondevicechange: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms33mozinputrangeignorepreventdefaultE"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms12cdataTagNameE"]
pub static nsGkAtoms_cdataTagName: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms14commentTagNameE"]
@@ -4196,8 +4200,6 @@ cfg_if! {
pub static nsGkAtoms_genConInitializerProperty: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms24labelMouseDownPtPropertyE"]
pub static nsGkAtoms_labelMouseDownPtProperty: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms15baseURIPropertyE"]
pub static nsGkAtoms_baseURIProperty: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms17lockedStyleStatesE"]
pub static nsGkAtoms_lockedStyleStates: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms20apzCallbackTransformE"]
@@ -4824,8 +4826,10 @@ cfg_if! {
pub static nsCSSPseudoElements_mozColorSwatch: *mut nsICSSPseudoElement;
#[link_name = "_ZN14nsCSSAnonBoxes7mozTextE"]
pub static nsCSSAnonBoxes_mozText: *mut nsICSSAnonBoxPseudo;
#[link_name = "_ZN14nsCSSAnonBoxes18mozOtherNonElementE"]
pub static nsCSSAnonBoxes_mozOtherNonElement: *mut nsICSSAnonBoxPseudo;
#[link_name = "_ZN14nsCSSAnonBoxes14oofPlaceholderE"]
pub static nsCSSAnonBoxes_oofPlaceholder: *mut nsICSSAnonBoxPseudo;
#[link_name = "_ZN14nsCSSAnonBoxes23firstLetterContinuationE"]
pub static nsCSSAnonBoxes_firstLetterContinuation: *mut nsICSSAnonBoxPseudo;
#[link_name = "_ZN14nsCSSAnonBoxes17mozAnonymousBlockE"]
pub static nsCSSAnonBoxes_mozAnonymousBlock: *mut nsICSSAnonBoxPseudo;
#[link_name = "_ZN14nsCSSAnonBoxes27mozAnonymousPositionedBlockE"]
@@ -7143,6 +7147,8 @@ cfg_if! {
pub static nsGkAtoms_scrollcorner: *mut nsIAtom;
#[link_name = "?scrolling@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_scrolling: *mut nsIAtom;
#[link_name = "?scrollPosition@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_scrollPosition: *mut nsIAtom;
#[link_name = "?section@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_section: *mut nsIAtom;
#[link_name = "?select@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onmozinterruptend: *mut nsIAtom;
#[link_name = "?ondevicechange@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_ondevicechange: *mut nsIAtom;
#[link_name = "?mozinputrangeignorepreventdefault@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsIAtom;
#[link_name = "?cdataTagName@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_cdataTagName: *mut nsIAtom;
#[link_name = "?commentTagName@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_genConInitializerProperty: *mut nsIAtom;
#[link_name = "?labelMouseDownPtProperty@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_labelMouseDownPtProperty: *mut nsIAtom;
#[link_name = "?baseURIProperty@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_baseURIProperty: *mut nsIAtom;
#[link_name = "?lockedStyleStates@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_lockedStyleStates: *mut nsIAtom;
#[link_name = "?apzCallbackTransform@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsCSSPseudoElements_mozColorSwatch: *mut nsICSSPseudoElement;
#[link_name = "?mozText@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsCSSAnonBoxes_mozText: *mut nsICSSAnonBoxPseudo;
#[link_name = "?mozOtherNonElement@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsCSSAnonBoxes_mozOtherNonElement: *mut nsICSSAnonBoxPseudo;
#[link_name = "?oofPlaceholder@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsCSSAnonBoxes_oofPlaceholder: *mut nsICSSAnonBoxPseudo;
#[link_name = "?firstLetterContinuation@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsCSSAnonBoxes_firstLetterContinuation: *mut nsICSSAnonBoxPseudo;
#[link_name = "?mozAnonymousBlock@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsCSSAnonBoxes_mozAnonymousBlock: *mut nsICSSAnonBoxPseudo;
#[link_name = "?mozAnonymousPositionedBlock@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
pub static nsGkAtoms_scrollcorner: *mut nsIAtom;
#[link_name = "\x01?scrolling@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_scrolling: *mut nsIAtom;
#[link_name = "\x01?scrollPosition@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_scrollPosition: *mut nsIAtom;
#[link_name = "\x01?section@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_section: *mut nsIAtom;
#[link_name = "\x01?select@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onmozinterruptend: *mut nsIAtom;
#[link_name = "\x01?ondevicechange@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_ondevicechange: *mut nsIAtom;
#[link_name = "\x01?mozinputrangeignorepreventdefault@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_mozinputrangeignorepreventdefault: *mut nsIAtom;
#[link_name = "\x01?cdataTagName@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_cdataTagName: *mut nsIAtom;
#[link_name = "\x01?commentTagName@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_genConInitializerProperty: *mut nsIAtom;
#[link_name = "\x01?labelMouseDownPtProperty@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_labelMouseDownPtProperty: *mut nsIAtom;
#[link_name = "\x01?baseURIProperty@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_baseURIProperty: *mut nsIAtom;
#[link_name = "\x01?lockedStyleStates@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_lockedStyleStates: *mut nsIAtom;
#[link_name = "\x01?apzCallbackTransform@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsCSSPseudoElements_mozColorSwatch: *mut nsICSSPseudoElement;
#[link_name = "\x01?mozText@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
pub static nsCSSAnonBoxes_mozText: *mut nsICSSAnonBoxPseudo;
#[link_name = "\x01?mozOtherNonElement@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
pub static nsCSSAnonBoxes_mozOtherNonElement: *mut nsICSSAnonBoxPseudo;
#[link_name = "\x01?oofPlaceholder@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
pub static nsCSSAnonBoxes_oofPlaceholder: *mut nsICSSAnonBoxPseudo;
#[link_name = "\x01?firstLetterContinuation@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
pub static nsCSSAnonBoxes_firstLetterContinuation: *mut nsICSSAnonBoxPseudo;
#[link_name = "\x01?mozAnonymousBlock@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
pub static nsCSSAnonBoxes_mozAnonymousBlock: *mut nsICSSAnonBoxPseudo;
#[link_name = "\x01?mozAnonymousPositionedBlock@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrollcorner as *mut _) } };
("scrolling") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrolling as *mut _) } };
("scroll-position") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_scrollPosition as *mut _) } };
("section") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_section as *mut _) } };
("select") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onmozinterruptend as *mut _) } };
("ondevicechange") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_ondevicechange as *mut _) } };
("mozinputrangeignorepreventdefault") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_mozinputrangeignorepreventdefault as *mut _) } };
("#cdata-section") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_cdataTagName as *mut _) } };
("#comment") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_genConInitializerProperty as *mut _) } };
("LabelMouseDownPtProperty") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_labelMouseDownPtProperty as *mut _) } };
("baseURIProperty") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_baseURIProperty as *mut _) } };
("lockedStyleStates") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_lockedStyleStates as *mut _) } };
("apzCallbackTransform") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSPseudoElements_mozColorSwatch as *mut _) } };
(":-moz-text") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozText as *mut _) } };
(":-moz-other-non-element") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozOtherNonElement as *mut _) } };
(":-moz-oof-placeholder") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_oofPlaceholder as *mut _) } };
(":-moz-first-letter-continuation") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_firstLetterContinuation as *mut _) } };
(":-moz-anonymous-block") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozAnonymousBlock as *mut _) } };
(":-moz-anonymous-positioned-block") =>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.