Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-25 23:28:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move util::cursor to style_traits

Browse source
This commit is contained in:
Anthony Ramine 2016-02-14 19:37:00 +01:00
parent c929dbe253
commit 290694b27e
27 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/cef/Cargo.lock generated
View file

@ -27,6 +27,7 @@ dependencies = [
"servo 0.0.1",
"stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -615,6 +616,7 @@ dependencies = [
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -685,6 +687,7 @@ dependencies = [
"script_traits 0.0.1",
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-glutin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -941,6 +944,7 @@ dependencies = [
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

3
ports/cef/Cargo.toml
View file

@ -50,6 +50,9 @@ features = ["non-geckolib"]
[dependencies.style]
path = "../../components/style"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.devtools]
path = "../../components/devtools"

1
ports/cef/lib.rs
View file

@ -39,6 +39,7 @@ extern crate net_traits;
extern crate msg;
extern crate util;
extern crate style;
extern crate style_traits;
extern crate stb_image;
extern crate libc;

2
ports/cef/window.rs
View file

@ -35,7 +35,7 @@ use std::ptr;
use std::rc::Rc;
use std::sync::mpsc::{Sender, channel};
use std_url::Url;
use util::cursor::Cursor;
use style_traits::cursor::Cursor;
use util::geometry::ScreenPx;
#[cfg(target_os="linux")]
extern crate x11;

3
ports/glutin/Cargo.toml
View file

@ -34,6 +34,9 @@ path = "../../components/msg"
[dependencies.net_traits]
path = "../../components/net_traits"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.util]
path = "../../components/util"

1
ports/glutin/lib.rs
View file

@ -17,6 +17,7 @@ extern crate layers;
extern crate msg;
extern crate net_traits;
#[cfg(feature = "window")] extern crate script_traits;
extern crate style_traits;
extern crate url;
extern crate util;
#[cfg(target_os = "linux")] extern crate x11;

2
ports/glutin/window.rs
View file

@ -29,8 +29,8 @@ use std::os::raw::c_void;
use std::ptr;
use std::rc::Rc;
use std::sync::mpsc::{channel, Sender};
use style_traits::cursor::Cursor;
use url::Url;
use util::cursor::Cursor;
use util::geometry::ScreenPx;
#[cfg(feature = "window")]
use util::opts;

3
ports/gonk/Cargo.lock generated
View file

@ -19,6 +19,7 @@ dependencies = [
"script_traits 0.0.1",
"servo 0.0.1",
"servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@ -617,6 +618,7 @@ dependencies = [
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -923,6 +925,7 @@ dependencies = [
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"style_traits 0.0.1",
"time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

3
ports/gonk/Cargo.toml
View file

@ -21,6 +21,9 @@ path = "../../components/script"
[dependencies.script_traits]
path = "../../components/script_traits"
[dependencies.style_traits]
path = "../../components/style_traits"
[dependencies.net_traits]
path = "../../components/net_traits"

1
ports/gonk/src/main.rs
View file

@ -35,6 +35,7 @@ extern crate msg;
extern crate net_traits;
extern crate script_traits;
extern crate servo;
extern crate style_traits;
extern crate time;
extern crate url;
extern crate util;

2
ports/gonk/src/window.rs
View file

@ -30,8 +30,8 @@ use std::mem::{transmute, size_of, zeroed};
use std::ptr;
use std::rc::Rc;
use std::sync::mpsc::{channel, Sender, Receiver};
use style_traits::cursor::Cursor;
use url::Url;
use util::cursor::Cursor;
use util::geometry::ScreenPx;
const GRALLOC_USAGE_HW_TEXTURE: c_int = 0x00000100;