diff options
Diffstat (limited to 'components/gfx')
| -rw-r--r-- | components/gfx/Cargo.toml | 7 | ||||
| -rw-r--r-- | components/gfx/paint_context.rs | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 40ca209c585..c5758e4257d 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -15,7 +15,7 @@ euclid = {version = "0.3", features = ["plugins"]} fnv = "1.0" harfbuzz-sys = "0.1" lazy_static = "0.1" -libc = "0.1" +libc = "0.2" log = "0.3" rand = "0.3" rustc-serialize = "0.3" @@ -25,6 +25,7 @@ smallvec = "0.1" string_cache = "0.2" time = "0.1.12" unicode-script = { version = "0.1", features = ["harfbuzz"] } +url = "0.5" [dependencies.plugins] path = "../plugins" @@ -67,10 +68,6 @@ path = "../script_traits" [dependencies.ipc-channel] git = "https://github.com/servo/ipc-channel" -[dependencies.url] -version = "0.2" -features = [ "serde_serialization" ] - [target.x86_64-apple-darwin.dependencies] core-foundation = "0.1" core-graphics = "0.1" diff --git a/components/gfx/paint_context.rs b/components/gfx/paint_context.rs index b579688e33f..5c7eb8c2016 100644 --- a/components/gfx/paint_context.rs +++ b/components/gfx/paint_context.rs @@ -27,7 +27,6 @@ use euclid::size::Size2D; use filters; use font_context::FontContext; use gfx_traits::color; -use libc::types::common::c99::uint32_t; use msg::compositor_msg::LayerKind; use net_traits::image::base::{Image, PixelFormat}; use std::default::Default; @@ -1803,7 +1802,7 @@ impl ScaledFontExtensionMethods for ScaledFont { let glyph_advance = glyph.advance(); let glyph_offset = glyph.offset().unwrap_or(Point2D::zero()); let azglyph = struct__AzGlyph { - mIndex: glyph.id() as uint32_t, + mIndex: glyph.id() as u32, mPosition: struct__AzPoint { x: (origin.x + glyph_offset.x).to_f32_px(), y: (origin.y + glyph_offset.y).to_f32_px(), @@ -1819,7 +1818,7 @@ impl ScaledFontExtensionMethods for ScaledFont { let mut glyphbuf = struct__AzGlyphBuffer { mGlyphs: azglyphs.as_mut_ptr(), - mNumGlyphs: azglyph_buf_len as uint32_t + mNumGlyphs: azglyph_buf_len as u32 }; unsafe { |