diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-02-25 05:05:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-25 05:05:09 -0500 |
commit | a28e15e4ea34ed068cc4a49a0625c54f370cd9e8 (patch) | |
tree | c2e71dbe15842a946cdd1b327205204414fd396a /components/script | |
parent | 427003210b3e16a82f958e35ff4212f26ffa35ab (diff) | |
parent | 02d3328d3c3006e264513ed1869839e350aa3242 (diff) | |
download | servo-a28e15e4ea34ed068cc4a49a0625c54f370cd9e8.tar.gz servo-a28e15e4ea34ed068cc4a49a0625c54f370cd9e8.zip |
Auto merge of #22347 - stevesweetney:master, r=ferjm
Implement HTMLMediaElement muted and defaultMuted attributes
<!-- Please describe your changes on the following line: -->
PR for issue #22291
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #22291 (github issue number if applicable).
- [X] There are tests for these changes OR
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/22347)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/htmlmediaelement.rs | 42 | ||||
-rw-r--r-- | components/script/dom/webidls/HTMLMediaElement.webidl | 4 |
2 files changed, 44 insertions, 2 deletions
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 97170befaf1..c64bd26e57c 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -199,6 +199,8 @@ pub struct HTMLMediaElement { volume: Cell<f64>, /// https://html.spec.whatwg.org/multipage/#dom-media-seeking seeking: Cell<bool>, + /// https://html.spec.whatwg.org/multipage/#dom-media-muted + muted: Cell<bool>, /// URL of the media resource, if any. resource_url: DomRefCell<Option<ServoUrl>>, /// https://html.spec.whatwg.org/multipage/#dom-media-played @@ -248,6 +250,7 @@ impl HTMLMediaElement { paused: Cell::new(true), defaultPlaybackRate: Cell::new(1.0), playbackRate: Cell::new(1.0), + muted: Cell::new(false), // FIXME(nox): Why is this initialised to true? autoplaying: Cell::new(true), delaying_the_load_event_flag: Default::default(), @@ -370,6 +373,10 @@ impl HTMLMediaElement { // playback position. } } + // https://html.spec.whatwg.org/multipage/#allowed-to-play + fn is_allowed_to_play(&self) -> bool { + true + } // https://html.spec.whatwg.org/multipage/#notify-about-playing fn notify_about_playing(&self) { @@ -1398,12 +1405,39 @@ impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-autoplay make_bool_setter!(SetAutoplay, "autoplay"); + // https://html.spec.whatwg.org/multipage/#dom-media-defaultmuted + make_bool_getter!(DefaultMuted, "muted"); + // https://html.spec.whatwg.org/multipage/#dom-media-defaultmuted + make_bool_setter!(SetDefaultMuted, "muted"); + // https://html.spec.whatwg.org/multipage/#dom-media-src make_url_getter!(Src, "src"); // https://html.spec.whatwg.org/multipage/#dom-media-src make_url_setter!(SetSrc, "src"); + // https://html.spec.whatwg.org/multipage/#dom-media-muted + fn Muted(&self) -> bool { + self.muted.get() + } + + // https://html.spec.whatwg.org/multipage/#dom-media-muted + fn SetMuted(&self, value: bool) { + if self.muted.get() == value { + return; + } + self.muted.set(value); + let _ = self.player.set_mute(value); + let window = window_from_node(self); + window + .task_manager() + .media_element_task_source() + .queue_simple_event(self.upcast(), atom!("volumechange"), &window); + if !self.is_allowed_to_play() { + self.internal_pause_steps(); + } + } + // https://html.spec.whatwg.org/multipage/#dom-media-srcobject fn GetSrcObject(&self) -> Option<DomRoot<Blob>> { self.src_object.get() @@ -1720,6 +1754,9 @@ impl HTMLMediaElementMethods for HTMLMediaElement { .task_manager() .media_element_task_source() .queue_simple_event(self.upcast(), atom!("volumechange"), &window); + if !self.is_allowed_to_play() { + self.internal_pause_steps(); + } } Ok(()) @@ -1734,6 +1771,11 @@ impl VirtualMethods for HTMLMediaElement { fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) { self.super_type().unwrap().attribute_mutated(attr, mutation); + if &local_name!("muted") == attr.local_name() { + self.SetMuted(mutation.new_value(attr).is_some()); + return; + } + if mutation.new_value(attr).is_none() { return; } diff --git a/components/script/dom/webidls/HTMLMediaElement.webidl b/components/script/dom/webidls/HTMLMediaElement.webidl index 0acd2a2c9a6..c932516773c 100644 --- a/components/script/dom/webidls/HTMLMediaElement.webidl +++ b/components/script/dom/webidls/HTMLMediaElement.webidl @@ -55,8 +55,8 @@ interface HTMLMediaElement : HTMLElement { // controls // [CEReactions] attribute boolean controls; [Throws] attribute double volume; - // attribute boolean muted; - // [CEReactions] attribute boolean defaultMuted; + attribute boolean muted; + [CEReactions] attribute boolean defaultMuted; // tracks // readonly attribute AudioTrackList audioTracks; |