Auto merge of #25806 - jdm:ipc-up, r=Manishearth

Update ipc-channel and crossbeam-channel

Depends on https://github.com/servo/webxr/pull/130 and https://github.com/servo/media/pull/333.

ports/glutin/Cargo.toml

@@ -60,7 +60,7 @@ lazy_static = "1"
 libservo = {path = "../../components/servo"}
 libc = "0.2"
 log = "0.4"
-rust-webvr = { version = "0.16", features = ["glwindow"] }
+rust-webvr = { version = "0.17", features = ["glwindow"] }
 servo-media = {git = "https://github.com/servo/media"}
 shellwords = "1.0.0"
 tinyfiledialogs = "3.0"

ports/gstplugin/Cargo.toml

@@ -15,16 +15,16 @@ crate-type = ["cdylib"]
 path = "lib.rs"
 
 [dependencies]
-crossbeam-channel = "0.3"
+crossbeam-channel = "0.4"
 euclid = "0.20"
 gleam = "0.6"
-glib = { version = "0.8", features = ["subclassing"] }
-gstreamer = { version = "0.14", features = ["subclassing"] }
-gstreamer-base = { version = "0.14", features = ["subclassing"] }
-gstreamer-gl = { version = "0.14" }
+glib = "0.9"
+gstreamer = "0.15"
+gstreamer-base = "0.15"
+gstreamer-gl = "0.15"
 gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
-gstreamer-sys = { version = "0.8" }
-gstreamer-video = { version = "0.14", features = ["subclassing"] }
+gstreamer-sys = "0.8"
+gstreamer-video = "0.15"
 log = "0.4"
 lazy_static = "1.4"
 libservo = {path = "../../components/servo"}

ports/gstplugin/servowebsrc.rs

@@ -12,7 +12,6 @@ use euclid::Rect;
 use euclid::Scale;
 use euclid::Size2D;
 
-use glib::glib_bool_error;
 use glib::glib_object_impl;
 use glib::glib_object_subclass;
 use glib::object::Cast;
@@ -110,6 +109,7 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::ffi::c_void;
 use std::rc::Rc;
+use std::str::FromStr;
 use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 use std::sync::Mutex;
@@ -519,7 +519,7 @@ impl ObjectSubclass for ServoWebSrc {
             env!("CARGO_PKG_AUTHORS"),
         );
 
-        let src_caps = Caps::from_string(CAPS).unwrap();
+        let src_caps = Caps::from_str(CAPS).unwrap();
         let src_pad_template =
             PadTemplate::new("src", PadDirection::Src, PadPresence::Always, &src_caps).unwrap();
         klass.add_pad_template(src_pad_template);
@@ -546,7 +546,7 @@ impl ObjectImpl for ServoWebSrc {
             Property("url", ..) => {
                 let mut guard = self.url.lock().expect("Failed to lock mutex");
                 let url = value.get().expect("Failed to get url value");
-                *guard = Some(url);
+                *guard = url;
             },
             _ => unimplemented!(),
         }
@@ -572,14 +572,14 @@ impl BaseSrcImpl for ServoWebSrc {
 
         // Save the video info for later use
         let info = VideoInfo::from_caps(outcaps)
-            .ok_or_else(|| gst_loggable_error!(CATEGORY, "Failed to get video info"))?;
+            .map_err(|_| gst_loggable_error!(CATEGORY, "Failed to get video info"))?;
         *self.info.lock().unwrap() = Some(info);
 
         // Save the framerate if it is set
         let framerate = outcaps
             .get_structure(0)
-            .and_then(|cap| cap.get::<Fraction>("framerate"));
-        if let Some(framerate) = framerate {
+            .and_then(|cap| cap.get::<Fraction>("framerate").ok());
+        if let Some(Some(framerate)) = framerate {
             let frame_duration_micros =
                 1_000_000 * *framerate.denom() as u64 / *framerate.numer() as u64;
             debug!("Setting frame duration to {}micros", frame_duration_micros);

ports/libmlservo/Cargo.toml

@@ -22,7 +22,7 @@ layout-2020 = ["simpleservo/layout-2020"]
 [dependencies]
 libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
 simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] }
-rust-webvr = { version = "0.16", features = ["magicleap"] }
+rust-webvr = { version = "0.17", features = ["magicleap"] }
 webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] }
 libc = "0.2"

ports/libsimpleservo/jniapi/Cargo.toml

@@ -16,7 +16,7 @@ bench = false
 [dependencies]
 android_injected_glue = "0.2"
 android_logger = "0.7"
-gstreamer = "0.14.5"
+gstreamer = "0.15"
 jni = "0.10.2"
 libc = "0.2"
 log = "0.4"