aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-08-19 08:07:47 -0400
committerGitHub <noreply@github.com>2019-08-19 08:07:47 -0400
commit4f4c2be144bf1c8d7fb8c9c67320c1c2352818f6 (patch)
treef1f7871618bb5cab6fec5a609cf23a978941b1bf /components
parentd5430ceba6449b52687e68a997699804b08c0b3f (diff)
parent507a1e4370c3f626c686f63d4b64c1686e73adbd (diff)
downloadservo-4f4c2be144bf1c8d7fb8c9c67320c1c2352818f6.tar.gz
servo-4f4c2be144bf1c8d7fb8c9c67320c1c2352818f6.zip
Auto merge of #24000 - ferjm:update.servo.media.shutdown, r=jdm
Update servo-media. Remove implicit shutdown requests. It all happens… … automagicly now - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24000) <!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/baseaudiocontext.rs14
-rw-r--r--components/script/dom/htmlmediaelement.rs10
2 files changed, 0 insertions, 24 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 22f20f2031d..74dd1863a75 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -83,7 +83,6 @@ pub struct BaseAudioContext {
eventtarget: EventTarget,
#[ignore_malloc_size_of = "servo_media"]
audio_context_impl: Arc<Mutex<AudioContext>>,
- browsing_context_id: BrowsingContextId,
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-destination
destination: MutNullableDom<AudioDestinationNode>,
listener: MutNullableDom<AudioListener>,
@@ -128,7 +127,6 @@ impl BaseAudioContext {
audio_context_impl: ServoMedia::get()
.unwrap()
.create_audio_context(&client_context_id, options.into()),
- browsing_context_id,
destination: Default::default(),
listener: Default::default(),
in_flight_resume_promises_queue: Default::default(),
@@ -555,18 +553,6 @@ impl BaseAudioContextMethods for BaseAudioContext {
}
}
-impl Drop for BaseAudioContext {
- fn drop(&mut self) {
- let client_context_id = ClientContextId::build(
- self.browsing_context_id.namespace_id.0,
- self.browsing_context_id.index.0.get(),
- );
- ServoMedia::get()
- .unwrap()
- .shutdown_audio_context(&client_context_id, self.audio_context_impl.clone());
- }
-}
-
impl From<BaseAudioContextOptions> for AudioContextOptions {
fn from(options: BaseAudioContextOptions) -> Self {
match options {
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 4a4ef4c859e..8855e0ee578 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -1855,16 +1855,6 @@ impl Drop for HTMLMediaElement {
}
});
- if let Some(ref player) = *self.player.borrow() {
- let browsing_context_id = window.window_proxy().top_level_browsing_context_id().0;
- let client_context_id = ClientContextId::build(
- browsing_context_id.namespace_id.0,
- browsing_context_id.index.0.get(),
- );
- ServoMedia::get()
- .unwrap()
- .shutdown_player(&client_context_id, player.clone());
- }
self.remove_controls();
}
}