Skip to content
Permalink
Browse files

Backed out 1 changesets because the gecko part (bug 1420117) has to b…

…e backed out for the mochitests r=backout on a CLOSED TREE

Backed out changeset baada68cad47

Backs out #19441
  • Loading branch information...
Gecko Backout authored and moz-servo-sync committed Dec 5, 2017
1 parent eed3adc commit 25436276ae38a75ac56c5cbfdc89faacc3cd7be1
@@ -11,7 +11,7 @@ use cssparser::{AtRuleParser, DeclarationListParser, DeclarationParser};
use cssparser::{Parser, Token, serialize_identifier, CowRcStr};
use error_reporting::{ContextualParseError, ParseErrorReporter};
#[cfg(feature = "gecko")] use gecko::rules::CounterStyleDescriptors;
#[cfg(feature = "gecko")] use gecko_bindings::structs::{ nsCSSCounterDesc, nsCSSValue };
#[cfg(feature = "gecko")] use gecko_bindings::structs::nsCSSCounterDesc;
use parser::{ParserContext, ParserErrorContext, Parse};
use selectors::parser::SelectorParseErrorKind;
use shared_lock::{SharedRwLockReadGuard, ToCssWithGuard};
@@ -225,30 +225,6 @@ macro_rules! counter_style_descriptors {
dest.write_str("}")
}
}

/// Parse a descriptor into an `nsCSSValue`.
#[cfg(feature = "gecko")]
pub fn parse_counter_style_descriptor<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
descriptor: nsCSSCounterDesc,
value: &mut nsCSSValue
) -> Result<(), ParseError<'i>> {
match descriptor {
$(
nsCSSCounterDesc::$gecko_ident => {
let v: $ty =
input.parse_entirely(|i| Parse::parse(context, i))?;
value.set_from(v);
}
)*
nsCSSCounterDesc::eCSSCounterDesc_COUNT |
nsCSSCounterDesc::eCSSCounterDesc_UNKNOWN => {
panic!("invalid counter descriptor");
}
}
Ok(())
}
}
}

@@ -564,8 +564,6 @@ cfg_if! {
pub static nsGkAtoms_dateTime: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms11datasourcesE"]
pub static nsGkAtoms_datasources: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms4dateE"]
pub static nsGkAtoms_date: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms8datetimeE"]
pub static nsGkAtoms_datetime: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms11datetimeboxE"]
@@ -5751,8 +5749,6 @@ cfg_if! {
pub static nsGkAtoms_dateTime: *mut nsStaticAtom;
#[link_name = "?datasources@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_datasources: *mut nsStaticAtom;
#[link_name = "?date@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_date: *mut nsStaticAtom;
#[link_name = "?datetime@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_datetime: *mut nsStaticAtom;
#[link_name = "?datetimebox@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_dateTime: *mut nsStaticAtom;
#[link_name = "\x01?datasources@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_datasources: *mut nsStaticAtom;
#[link_name = "\x01?date@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_date: *mut nsStaticAtom;
#[link_name = "\x01?datetime@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_datetime: *mut nsStaticAtom;
#[link_name = "\x01?datetimebox@nsGkAtoms@@2PAVnsStaticAtom@@A"]
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_dateTime as *mut _) } }};
("datasources") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_datasources as *mut _) } }};
("date") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_date as *mut _) } }};
("datetime") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_datetime as *mut _) } }};
("datetimebox") =>
Oops, something went wrong.

0 comments on commit 2543627

Please sign in to comment.
You can’t perform that action at this time.