aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-03-11 11:21:10 -0400
committerGitHub <noreply@github.com>2019-03-11 11:21:10 -0400
commit6890347cd595143bcbce8a147e0a801dff269d0c (patch)
treef3605e5f44c7d0691a3dfe58749124476a622563 /components/script
parent7bdfad92a5a2bf34fcabb38f99789b3f5d7989af (diff)
parent4b01d8ce0d11be037264b7550d5b4acaaabe7ea3 (diff)
downloadservo-6890347cd595143bcbce8a147e0a801dff269d0c.tar.gz
servo-6890347cd595143bcbce8a147e0a801dff269d0c.zip
Auto merge of #22966 - Goncalerta:22962, r=jdm
Simplify VideoTrackList::set_selected --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [x] These changes fix #22962 (GitHub issue number if applicable) - [x] These changes do not require tests because just refactors existing code <!-- 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/22966) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/videotracklist.rs43
1 files changed, 11 insertions, 32 deletions
diff --git a/components/script/dom/videotracklist.rs b/components/script/dom/videotracklist.rs
index e495efcccd2..497d3f0ce55 100644
--- a/components/script/dom/videotracklist.rs
+++ b/components/script/dom/videotracklist.rs
@@ -76,39 +76,18 @@ impl VideoTrackList {
.media_element_task_source_with_canceller();
if let Some(current) = self.selected_index() {
- if current != idx {
- self.tracks.borrow()[current].set_selected(false);
- track.set_selected(true);
-
- let _ = source.queue_with_canceller(
- task!(media_track_change: move || {
- let this = this.root();
- this.upcast::<EventTarget>().fire_event(atom!("change"));
- }),
- &canceller,
- );
- } else {
- self.tracks.borrow()[current].set_selected(false);
-
- let _ = source.queue_with_canceller(
- task!(media_track_change: move || {
- let this = this.root();
- this.upcast::<EventTarget>().fire_event(atom!("change"));
- }),
- &canceller,
- );
- }
- } else {
- track.set_selected(true);
-
- let _ = source.queue_with_canceller(
- task!(media_track_change: move || {
- let this = this.root();
- this.upcast::<EventTarget>().fire_event(atom!("change"));
- }),
- &canceller,
- );
+ self.tracks.borrow()[current].set_selected(false);
}
+
+ track.set_selected(value);
+
+ let _ = source.queue_with_canceller(
+ task!(media_track_change: move || {
+ let this = this.root();
+ this.upcast::<EventTarget>().fire_event(atom!("change"));
+ }),
+ &canceller,
+ );
}
pub fn add(&self, track: &VideoTrack) {