diff options
| author | Alex Touchet <alextouchet@outlook.com> | 2018-09-11 09:06:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 09:06:42 -0700 |
| commit | 025b5550fc6f1fd74605b09973ffc606dae7432c (patch) | |
| tree | 7dfb1026318b7a0135273b667d3f44e3ee8d737d /components/gfx/lib.rs | |
| parent | 9a7e1d17f0e054cb9f7eaafeee943a2ec5bc5e26 (diff) | |
| parent | 049eb6887e29d8409b1dfe55bc31803f1c3220da (diff) | |
| download | servo-025b5550fc6f1fd74605b09973ffc606dae7432c.tar.gz servo-025b5550fc6f1fd74605b09973ffc606dae7432c.zip | |
Merge branch 'master' into tidy
Diffstat (limited to 'components/gfx/lib.rs')
| -rw-r--r-- | components/gfx/lib.rs | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index a1b72e4e0c9..442a9c8ae3a 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -9,14 +9,18 @@ extern crate app_units; extern crate bitflags; // Mac OS-specific library dependencies -#[cfg(target_os = "macos")] extern crate byteorder; -#[cfg(target_os = "macos")] extern crate core_foundation; -#[cfg(target_os = "macos")] extern crate core_graphics; -#[cfg(target_os = "macos")] extern crate core_text; +#[cfg(target_os = "macos")] +extern crate byteorder; +#[cfg(target_os = "macos")] +extern crate core_foundation; +#[cfg(target_os = "macos")] +extern crate core_graphics; +#[cfg(target_os = "macos")] +extern crate core_text; // Windows-specific library dependencies -#[cfg(target_os = "windows")] extern crate dwrote; -#[cfg(target_os = "windows")] extern crate truetype; +#[cfg(target_os = "windows")] +extern crate dwrote; extern crate euclid; extern crate fnv; @@ -24,8 +28,8 @@ extern crate fnv; #[cfg(target_os = "linux")] extern crate fontconfig; extern crate fontsan; -#[cfg(any(target_os = "linux", target_os = "android"))] extern crate freetype; -#[cfg(any(target_os = "linux", target_os = "android"))] extern crate servo_allocator; +#[cfg(any(target_os = "linux", target_os = "android"))] +extern crate freetype; extern crate gfx_traits; // Eventually we would like the shaper to be pluggable, as many operating systems have their own @@ -35,23 +39,33 @@ extern crate harfbuzz_sys as harfbuzz; extern crate ipc_channel; #[macro_use] extern crate lazy_static; -#[cfg(any(target_os = "linux", target_os = "android"))] extern crate libc; +#[cfg(any(target_os = "linux", target_os = "android"))] +extern crate libc; #[macro_use] extern crate log; #[cfg_attr(target_os = "windows", macro_use)] extern crate malloc_size_of; extern crate net_traits; extern crate ordered_float; -#[cfg(all(feature = "unstable", any(target_feature = "sse2", target_feature = "neon")))] +#[cfg(all( + feature = "unstable", + any(target_feature = "sse2", target_feature = "neon") +))] extern crate packed_simd; extern crate range; -#[macro_use] extern crate serde; +#[macro_use] +extern crate serde; +#[cfg(any(target_os = "linux", target_os = "android"))] +extern crate servo_allocator; extern crate servo_arc; -#[macro_use] extern crate servo_atoms; +#[macro_use] +extern crate servo_atoms; extern crate servo_url; extern crate smallvec; extern crate style; extern crate time; +#[cfg(target_os = "windows")] +extern crate truetype; extern crate ucd; extern crate unicode_bidi; extern crate unicode_script; @@ -61,7 +75,8 @@ extern crate xi_unicode; extern crate xml5ever; // Fonts -#[macro_use] pub mod font; +#[macro_use] +pub mod font; pub mod font_cache_thread; pub mod font_context; pub mod font_template; |