Skip to content

Commit 4eb9da3

Browse files
authored
Remove dependency on webrender_api (#92)
Signed-off-by: Nico Burns <[email protected]>
1 parent 639802f commit 4eb9da3

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

style_traits/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ name = "style_traits"
1111
path = "lib.rs"
1212

1313
[features]
14-
servo = ["servo_atoms", "cssparser/serde", "webrender_api", "url", "euclid/serde"]
14+
servo = ["servo_atoms", "cssparser/serde", "url", "euclid/serde"]
1515
gecko = []
1616

1717
[dependencies]
@@ -30,4 +30,3 @@ thin-vec = "0.2"
3030
to_shmem = { path = "../to_shmem" }
3131
to_shmem_derive = { path = "../to_shmem_derive" }
3232
url = { version = "2.5", optional = true }
33-
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65", optional = true }

style_traits/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ extern crate to_shmem;
3333
#[macro_use]
3434
extern crate to_shmem_derive;
3535
#[cfg(feature = "servo")]
36-
extern crate webrender_api;
37-
#[cfg(feature = "servo")]
3836
extern crate url;
39-
#[cfg(feature = "servo")]
40-
pub use webrender_api::units::DevicePixel;
4137

4238
use cssparser::{CowRcStr, Token};
4339
use selectors::parser::SelectorParseErrorKind;
@@ -47,12 +43,10 @@ use servo_atoms::Atom;
4743
/// One hardware pixel.
4844
///
4945
/// This unit corresponds to the smallest addressable element of the display hardware.
50-
#[cfg(not(feature = "servo"))]
5146
#[derive(Clone, Copy, Debug)]
5247
pub enum DevicePixel {}
5348

5449
/// Represents a mobile style pinch zoom factor.
55-
/// TODO(gw): Once WR supports pinch zoom, use a type directly from webrender_api.
5650
#[derive(Clone, Copy, Debug, PartialEq)]
5751
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize, MallocSizeOf))]
5852
pub struct PinchZoomFactor(f32);

0 commit comments

Comments
 (0)