diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-11 23:05:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 23:05:37 -0500 |
| commit | 6d6d16f7f492e6346f0391e352015226a4444806 (patch) | |
| tree | d991c986a7f83be25157934e93c248ea86ee4b00 /components/style/lib.rs | |
| parent | baac1e2c69d3b6e840ced2be4b5e03bb39bd40d5 (diff) | |
| parent | d1f8d576f83714fe674a36c5b718341c236312e6 (diff) | |
| download | servo-6d6d16f7f492e6346f0391e352015226a4444806.tar.gz servo-6d6d16f7f492e6346f0391e352015226a4444806.zip | |
Auto merge of #25717 - emilio:gecko-sync, r=emilio,nox
style: Sync changes from mozilla-central.
See individual commits for details. https://bugzilla.mozilla.org/show_bug.cgi?id=1614394
Diffstat (limited to 'components/style/lib.rs')
| -rw-r--r-- | components/style/lib.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/style/lib.rs b/components/style/lib.rs index 354950f9c15..6c4b1d5a2a9 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -72,7 +72,6 @@ extern crate num_cpus; extern crate num_derive; extern crate num_integer; extern crate num_traits; -extern crate ordered_float; extern crate owning_ref; extern crate parking_lot; extern crate precomputed_hash; @@ -120,6 +119,8 @@ pub mod attr; pub mod author_styles; pub mod bezier; pub mod bloom; +#[path = "properties/computed_value_flags.rs"] +pub mod computed_value_flags; pub mod context; pub mod counter_style; pub mod custom_properties; @@ -173,10 +174,12 @@ pub mod values; pub use crate::gecko_string_cache as string_cache; #[cfg(feature = "gecko")] pub use crate::gecko_string_cache::Atom; +/// The namespace prefix type for Gecko, which is just an atom. #[cfg(feature = "gecko")] -pub use crate::gecko_string_cache::Atom as Prefix; +pub type Prefix = crate::gecko_string_cache::Atom; +/// The local name of an element for Gecko, which is just an atom. #[cfg(feature = "gecko")] -pub use crate::gecko_string_cache::Atom as LocalName; +pub type LocalName = crate::gecko_string_cache::Atom; #[cfg(feature = "gecko")] pub use crate::gecko_string_cache::Namespace; |