Auto merge of #15537 - servo:webrender, r=SimonSapin

Update ipc-channel to 0.6.3  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15537)
2025-08-08 06:55:31 +01:00 · 2017-02-16 03:53:49 -08:00 · 2017-02-16 03:53:49 -08:00 · 4a0b730caf
commit 4a0b730caf
parent 35e7a4cd2c 85e2648ffc
32 changed files with 135 additions and 93 deletions
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@ -13,7 +13,7 @@ path = "lib.rs"
 bitflags = "0.7"
 bluetooth_traits = {path = "../bluetooth_traits"}
 device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 servo_rand = {path = "../rand"}
 uuid = {version = "0.3.1", features = ["v4"]}

--- a/components/bluetooth_traits/Cargo.toml
+++ b/components/bluetooth_traits/Cargo.toml
@ -10,7 +10,7 @@ name = "bluetooth_traits"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 regex = "0.2"
 serde = "0.8"
 serde_derive = "0.8"
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@ -15,7 +15,7 @@ canvas_traits = {path = "../canvas_traits"}
 cssparser = {version = "0.9", features = ["heap_size", "serde-serialization"]}
 euclid = "0.10.1"
 gleam = "0.2.8"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 log = "0.3.5"
 num-traits = "0.1.32"
 offscreen_gl_context = "0.5.0"
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@ -14,7 +14,7 @@ cssparser = {version = "0.9", features = ["heap_size", "serde-serialization"]}
 euclid = "0.10.1"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 plugins = {path = "../plugins"}
 serde = {version = "0.8", features = ["unstable"]}
 serde_derive = "0.8"
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@ -14,7 +14,7 @@ euclid = "0.10.1"
 gfx_traits = {path = "../gfx_traits"}
 gleam = "0.2.8"
 image = "0.12"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@ -20,7 +20,7 @@ devtools_traits = {path = "../devtools_traits"}
 euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 layout_traits = {path = "../layout_traits"}
 log = "0.3.5"
 msg = {path = "../msg"}
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@ -78,6 +78,7 @@ use event_loop::EventLoop;
 use frame::{Frame, FrameChange, FrameState, FrameTreeIterator, FullFrameTreeIterator};
 use gfx::font_cache_thread::FontCacheThread;
 use gfx_traits::Epoch;
+use ipc_channel::SerializeError;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use layout_traits::LayoutThreadFactory;
@ -109,7 +110,6 @@ use servo_remutex::ReentrantMutex;
 use servo_url::ServoUrl;
 use std::borrow::ToOwned;
 use std::collections::{HashMap, VecDeque};
-use std::io::Error as IOError;
 use std::iter::once;
 use std::marker::PhantomData;
 use std::process;
@ -1228,7 +1228,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
        self.pipelines.remove(&pipeline_id);
    }

-    fn handle_send_error(&mut self, pipeline_id: PipelineId, err: IOError) {
+    fn handle_send_error(&mut self, pipeline_id: PipelineId, err: SerializeError) {
        // Treat send error the same as receiving a panic message
        debug!("Pipeline {:?} send error ({}).", pipeline_id, err);
        let top_level_frame_id = self.get_top_level_frame_for_pipeline(pipeline_id);
--- a/components/constellation/event_loop.rs
+++ b/components/constellation/event_loop.rs
@ -6,9 +6,9 @@
 //! view of a script thread. When an `EventLoop` is dropped, an `ExitScriptThread`
 //! message is sent to the script thread, asking it to shut down.

+use ipc_channel::SerializeError;
 use ipc_channel::ipc::IpcSender;
 use script_traits::ConstellationControlMsg;
-use std::io::Error as IOError;
 use std::marker::PhantomData;
 use std::rc::Rc;

@ -34,7 +34,7 @@ impl EventLoop {
    }

    /// Send a message to the event loop.
-    pub fn send(&self, msg: ConstellationControlMsg) -> Result<(), IOError> {
+    pub fn send(&self, msg: ConstellationControlMsg) -> Result<(), SerializeError> {
        self.script_chan.send(msg)
    }

--- a/components/constellation/pipeline.rs
+++ b/components/constellation/pipeline.rs
@ -11,6 +11,7 @@ use euclid::scale_factor::ScaleFactor;
 use euclid::size::TypedSize2D;
 use event_loop::EventLoop;
 use gfx::font_cache_thread::FontCacheThread;
+use ipc_channel::SerializeError;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use layout_traits::LayoutThreadFactory;
@ -31,7 +32,6 @@ use std::collections::HashMap;
 #[cfg(not(windows))]
 use std::env;
 use std::ffi::OsStr;
-use std::io::Error as IOError;
 use std::process;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
@ -178,7 +178,7 @@ pub struct InitialPipelineState {
 impl Pipeline {
    /// Starts a layout thread, and possibly a script thread, in
    /// a new process if requested.
-    pub fn spawn<Message, LTF, STF>(state: InitialPipelineState) -> Result<Pipeline, IOError>
+    pub fn spawn<Message, LTF, STF>(state: InitialPipelineState) -> Result<Pipeline, SerializeError>
        where LTF: LayoutThreadFactory<Message=Message>,
              STF: ScriptThreadFactory<Message=Message>
    {
@ -523,7 +523,7 @@ impl UnprivilegedPipelineContent {
    }

    #[cfg(not(target_os = "windows"))]
-    pub fn spawn_multiprocess(self) -> Result<(), IOError> {
+    pub fn spawn_multiprocess(self) -> Result<(), SerializeError> {
        use gaol::sandbox::{self, Sandbox, SandboxMethods};
        use ipc_channel::ipc::IpcOneShotServer;
        use sandboxing::content_process_sandbox_profile;
@ -571,7 +571,7 @@ impl UnprivilegedPipelineContent {
    }

    #[cfg(target_os = "windows")]
-    pub fn spawn_multiprocess(self) -> Result<(), IOError> {
+    pub fn spawn_multiprocess(self) -> Result<(), SerializeError> {
        error!("Multiprocess is not supported on Windows.");
        process::exit(1);
    }
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@ -14,7 +14,7 @@ devtools_traits = {path = "../devtools_traits"}
 encoding = "0.2"
 hyper = "0.9.9"
 hyper_serde = "0.1.4"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 log = "0.3.5"
 msg = {path = "../msg"}
 plugins = {path = "../plugins"}
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@ -15,7 +15,7 @@ heapsize = "0.3.0"
 heapsize_derive = "0.1"
 hyper = "0.9.9"
 hyper_serde = "0.1.4"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 msg = {path = "../msg"}
 serde = "0.8"
 serde_derive = "0.8"
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@ -20,7 +20,7 @@ gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3.5"
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@ -21,7 +21,7 @@ gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 html5ever-atoms = "0.1"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 libc = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@ -16,7 +16,7 @@ fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 layout = {path = "../layout"}
 layout_traits = {path = "../layout_traits"}
 lazy_static = "0.2"
--- a/components/layout_traits/Cargo.toml
+++ b/components/layout_traits/Cargo.toml
@ -11,11 +11,11 @@ path = "lib.rs"

 [dependencies]
 gfx = {path = "../gfx"}
-script_traits = {path = "../script_traits"}
+ipc-channel = "0.6.3"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
-ipc-channel = "0.5"
+script_traits = {path = "../script_traits"}
 servo_url = {path = "../url"}

 [dependencies.webrender_traits]
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@ -18,7 +18,7 @@ flate2 = "0.2.0"
 hyper = "0.9.9"
 hyper_serde = "0.1.4"
 immeta = "0.3.1"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 lazy_static = "0.2"
 log = "0.3.5"
 matches = "0.1"
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@ -11,7 +11,7 @@ path = "lib.rs"

 [dependencies]
 msg = {path = "../msg"}
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 hyper = "0.9.9"
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@ -39,12 +39,12 @@ use hyper::header::{ContentType, Headers, ReferrerPolicy as ReferrerPolicyHeader
 use hyper::http::RawStatus;
 use hyper::mime::{Attr, Mime};
 use hyper_serde::Serde;
+use ipc_channel::SerializeError;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use ipc_channel::router::ROUTER;
 use request::{Request, RequestInit};
 use response::{HttpsState, Response};
 use servo_url::ServoUrl;
-use std::io::Error as IOError;
 use storage_thread::StorageThreadMsg;
 use websocket::header;

@ -266,7 +266,7 @@ impl<T: FetchResponseListener> Action<T> for FetchResponseMsg {
 /// Handle to a resource thread
 pub type CoreResourceThread = IpcSender<CoreResourceMsg>;

-pub type IpcSendResult = Result<(), IOError>;
+pub type IpcSendResult = Result<(), SerializeError>;

 /// Abstraction of the ability to send a particular type of message,
 /// used by net_traits::ResourceThreads to ease the use its IpcSender sub-fields
--- a/components/profile/Cargo.toml
+++ b/components/profile/Cargo.toml
@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 profile_traits = {path = "../profile_traits"}
 plugins = {path = "../plugins"}
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 heartbeats-simple = "0.3"
 log = "0.3.5"
 serde = "0.8"
--- a/components/profile_traits/Cargo.toml
+++ b/components/profile_traits/Cargo.toml
@ -13,9 +13,9 @@ path = "lib.rs"
 energy-profiling = ["energymon", "energy-monitor"]

 [dependencies]
-ipc-channel = "0.5"
-energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
 energy-monitor = {version = "0.2.0", optional = true}
+energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
+ipc-channel = "0.6.3"
 log = "0.3.5"
 plugins = {path = "../plugins"}
 serde = "0.8"
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@ -49,7 +49,7 @@ html5ever-atoms = {version = "0.1", features = ["heap_size"]}
 hyper = "0.9.9"
 hyper_serde = "0.1.4"
 image = "0.12"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]}
 jstraceable_derive = {path = "../jstraceable_derive"}
 libc = "0.2"
--- a/components/script_layout_interface/Cargo.toml
+++ b/components/script_layout_interface/Cargo.toml
@ -19,7 +19,7 @@ gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_derive = "0.1"
 html5ever-atoms = "0.1"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 libc = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@ -21,7 +21,7 @@ heapsize = "0.3.0"
 heapsize_derive = "0.1"
 hyper = "0.9.9"
 hyper_serde = "0.1.4"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 libc = "0.2"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@ -34,7 +34,7 @@ env_logger = "0.4"
 euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gleam = "0.2"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 layout_thread = {path = "../layout_thread"}
 log = "0.3"
 msg = {path = "../msg"}
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@ -14,7 +14,7 @@ cookie = {version = "0.2.5", features = ["serialize-rustc"]}
 euclid = "0.10.1"
 hyper = "0.9.9"
 image = "0.12"
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
--- a/components/webvr/Cargo.toml
+++ b/components/webvr/Cargo.toml
@ -10,7 +10,7 @@ name = "webvr"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 log = "0.3"
 msg = {path = "../msg"}
 script_traits = {path = "../script_traits"}
--- a/components/webvr_traits/Cargo.toml
+++ b/components/webvr_traits/Cargo.toml
@ -10,7 +10,7 @@ name = "webvr_traits"
 path = "lib.rs"

 [dependencies]
-ipc-channel = "0.5"
+ipc-channel = "0.6.3"
 msg = {path = "../msg"}
 serde = "0.8"
 serde_derive = "0.8"