servo-media 1e28d1d997: don't unwrap ServoMedia::get() (#35049)

Signed-off-by: mcc <andi.m.mcclure@gmail.com>

6 files changed, 7 insertions, 8 deletions

diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 3c9e36a4ec3..c16156e42ca 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -127,7 +127,6 @@ impl BaseAudioContext {
         let client_context_id =
             ClientContextId::build(pipeline_id.namespace_id.0, pipeline_id.index.0.get());
         let audio_context_impl = ServoMedia::get()
-            .unwrap()
             .create_audio_context(&client_context_id, options.convert())
             .map_err(|_| Error::NotSupported)?;
 
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index b73bec01967..8263d3f15ef 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -676,7 +676,7 @@ impl Document {
 
         // Set the document's activity level, reflow if necessary, and suspend or resume timers.
         self.activity.set(activity);
-        let media = ServoMedia::get().unwrap();
+        let media = ServoMedia::get();
         let pipeline_id = self.window().pipeline_id();
         let client_context_id =
             ClientContextId::build(pipeline_id.namespace_id.0, pipeline_id.index.0.get());
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 704ec00f45c..60604c6c2df 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -1361,7 +1361,7 @@ impl HTMLMediaElement {
         let pipeline_id = window.pipeline_id();
         let client_context_id =
             ClientContextId::build(pipeline_id.namespace_id.0, pipeline_id.index.0.get());
-        let player = ServoMedia::get().unwrap().create_player(
+        let player = ServoMedia::get().create_player(
             &client_context_id,
             stream_type,
             action_sender,
@@ -2165,7 +2165,7 @@ impl HTMLMediaElementMethods<crate::DomTypeHolder> for HTMLMediaElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-navigator-canplaytype
     fn CanPlayType(&self, type_: DOMString) -> CanPlayTypeResult {
-        match ServoMedia::get().unwrap().can_play_type(&type_) {
+        match ServoMedia::get().can_play_type(&type_) {
             SupportsMediaType::No => CanPlayTypeResult::_empty,
             SupportsMediaType::Maybe => CanPlayTypeResult::Maybe,
             SupportsMediaType::Probably => CanPlayTypeResult::Probably,
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs
index 2d347dd8611..83682053e4e 100644
--- a/components/script/dom/mediadevices.rs
+++ b/components/script/dom/mediadevices.rs
@@ -59,7 +59,7 @@ impl MediaDevicesMethods<crate::DomTypeHolder> for MediaDevices {
         can_gc: CanGc,
     ) -> Rc<Promise> {
         let p = Promise::new_in_current_realm(comp, can_gc);
-        let media = ServoMedia::get().unwrap();
+        let media = ServoMedia::get();
         let stream = MediaStream::new(&self.global(), can_gc);
         if let Some(constraints) = convert_constraints(&constraints.audio) {
             if let Some(audio) = media.create_audioinput_stream(constraints) {
@@ -89,7 +89,7 @@ impl MediaDevicesMethods<crate::DomTypeHolder> for MediaDevices {
         // XXX Steps 2.1 - 2.4
 
         // Step 2.5
-        let media = ServoMedia::get().unwrap();
+        let media = ServoMedia::get();
         let device_monitor = media.get_device_monitor();
         let result_list = match device_monitor.enumerate_devices() {
             Ok(devices) => devices
diff --git a/components/script/dom/mediastreamaudiodestinationnode.rs b/components/script/dom/mediastreamaudiodestinationnode.rs
index 9465fbd0c4c..29a3a19a6f4 100644
--- a/components/script/dom/mediastreamaudiodestinationnode.rs
+++ b/components/script/dom/mediastreamaudiodestinationnode.rs
@@ -35,7 +35,7 @@ impl MediaStreamAudioDestinationNode {
         options: &AudioNodeOptions,
         can_gc: CanGc,
     ) -> Fallible<MediaStreamAudioDestinationNode> {
-        let media = ServoMedia::get().unwrap();
+        let media = ServoMedia::get();
         let (socket, id) = media.create_stream_and_socket(MediaStreamType::Audio);
         let stream = MediaStream::new_single(&context.global(), id, MediaStreamType::Audio, can_gc);
         let node_options = options.unwrap_or(
diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
index 71e39922991..e38ce409a7d 100644
--- a/components/script/dom/rtcpeerconnection.rs
+++ b/components/script/dom/rtcpeerconnection.rs
@@ -189,7 +189,7 @@ impl RTCPeerConnection {
             can_gc,
         );
         let signaller = this.make_signaller();
-        *this.controller.borrow_mut() = Some(ServoMedia::get().unwrap().create_webrtc(signaller));
+        *this.controller.borrow_mut() = Some(ServoMedia::get().create_webrtc(signaller));
         if let Some(ref servers) = config.iceServers {
             if let Some(server) = servers.first() {
                 let server = match server.urls {