diff options
Diffstat (limited to 'components/script_traits')
-rw-r--r-- | components/script_traits/Cargo.toml | 3 | ||||
-rw-r--r-- | components/script_traits/lib.rs | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index c7eacee52f7..42a46ac3bdf 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -19,7 +19,7 @@ euclid = "0.19" gfx_traits = {path = "../gfx_traits"} hyper = "0.10" hyper_serde = "0.8" -ipc-channel = "0.10" +ipc-channel = "0.11" libc = "0.2" malloc_size_of = { path = "../malloc_size_of" } malloc_size_of_derive = { path = "../malloc_size_of_derive" } @@ -29,6 +29,7 @@ profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" serde = "1.0" servo_atoms = {path = "../atoms"} +servo_channel = {path = "../channel"} servo_url = {path = "../url"} style_traits = {path = "../style_traits", features = ["servo"]} time = "0.1.12" diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 02b4bd7efed..d92c5f1b82e 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -30,6 +30,7 @@ extern crate profile_traits; extern crate rustc_serialize; #[macro_use] extern crate serde; extern crate servo_atoms; +extern crate servo_channel; extern crate servo_url; extern crate style_traits; extern crate time; @@ -60,12 +61,12 @@ use profile_traits::mem; use profile_traits::time as profile_time; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use servo_atoms::Atom; +use servo_channel::{Receiver, Sender}; use servo_url::ImmutableOrigin; use servo_url::ServoUrl; use std::collections::HashMap; use std::fmt; use std::sync::Arc; -use std::sync::mpsc::{Receiver, Sender, RecvTimeoutError}; use style_traits::CSSPixel; use style_traits::SpeculativePainter; use style_traits::cursor::CursorKind; @@ -804,12 +805,6 @@ pub enum PaintWorkletError { WorkletNotFound, } -impl From<RecvTimeoutError> for PaintWorkletError { - fn from(_: RecvTimeoutError) -> PaintWorkletError { - PaintWorkletError::Timeout - } -} - /// Execute paint code in the worklet thread pool. pub trait Painter: SpeculativePainter { /// <https://drafts.css-houdini.org/css-paint-api/#draw-a-paint-image> |