Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add task source for media element #21879

Merged
merged 1 commit into from Oct 11, 2018

Conversation

@chansuke
Copy link
Contributor

chansuke commented Oct 6, 2018


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #21612 .
  • These changes do not require tests because the existing test should cover this code.

This change is Reviewable

@ghost
Copy link

ghost commented Oct 6, 2018

No Taskcluster jobs started for this pull request
The `allowPullRequests` configuration for this repository (in `.taskcluster.yml` on the
default branch) does not allow starting tasks for this pull request.
@highfive
Copy link

highfive commented Oct 6, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/script_thread.rs, components/script/dom/window.rs, components/script/dom/htmlmediaelement.rs, components/script/task_source/mod.rs, components/script/task_source/media_element.rs
  • @KiChjang: components/script/script_thread.rs, components/script/dom/window.rs, components/script/dom/htmlmediaelement.rs, components/script/task_source/mod.rs, components/script/task_source/media_element.rs
@highfive
Copy link

highfive commented Oct 6, 2018

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!
@@ -619,9 +615,7 @@ impl HTMLMediaElement {
let this = Trusted::new(self);
let generation_id = self.generation_id.get();
self.take_pending_play_promises(Err(Error::NotSupported));
// FIXME(nox): Why are errors silenced here?

This comment has been minimized.

Copy link
@ferjm

ferjm Oct 9, 2018

Member

This FIXME is still valid :) Do not remove it, please.

Copy link
Member

ferjm left a comment

Thanks for working on this @chansuke :)

The task source related changes looks good to me. However, it would be great if you could remove the second commit and rebase on top of master instead of creating a merge commit.

Thanks!

@chansuke
Copy link
Contributor Author

chansuke commented Oct 9, 2018

@ferjm Ok.Thanks for your review.

@chansuke chansuke force-pushed the chansuke:add_element_event_taskforce branch 3 times, most recently from 09ba080 to 5f62b64 Oct 10, 2018
Copy link
Member

ferjm left a comment

Looks better now :) Thanks for the rebase.

I think there are only two things left to fix here:

use task_source::{TaskSource, TaskSourceName};

#[derive(Clone, JSTraceable)]
pub struct MediaElementTaskSource(pub Sender<MainThreadScriptMsg>, pub PipelineId);

This comment has been minimized.

Copy link
@ferjm

ferjm Oct 10, 2018

Member

This Sender needs to be a servo_channel::Sender instead of a std::sync::mpsc::Sender

@chansuke chansuke force-pushed the chansuke:add_element_event_taskforce branch from 5f62b64 to 3e50fda Oct 10, 2018
@ferjm
Copy link
Member

ferjm commented Oct 10, 2018

One last change ;)

https://travis-ci.org/servo/servo/jobs/439558351#L447

Tip: you can check that tidy is happy with the patch by running ./mach test-tidy locally.

@chansuke chansuke force-pushed the chansuke:add_element_event_taskforce branch from 3e50fda to 7b3cf27 Oct 10, 2018
@ferjm
Copy link
Member

ferjm commented Oct 10, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

Trying commit 7b3cf27 with merge 7c41e75...

bors-servo added a commit that referenced this pull request Oct 10, 2018
Add task source for media element

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #21612 .
- [x] These changes do not require tests because the existing test should cover this code.

<!-- 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/21879)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

💔 Test failed - android-x86

@CYBAI
Copy link
Collaborator

CYBAI commented Oct 10, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

Trying commit 7b3cf27 with merge 1523000...

bors-servo added a commit that referenced this pull request Oct 10, 2018
Add task source for media element

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #21612 .
- [x] These changes do not require tests because the existing test should cover this code.

<!-- 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/21879)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

💔 Test failed - linux-rel-wpt

@ferjm
Copy link
Member

ferjm commented Oct 10, 2018

@bors-servo try retry

@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

Trying commit 7b3cf27 with merge 7ac3543...

bors-servo added a commit that referenced this pull request Oct 10, 2018
Add task source for media element

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #21612 .
- [x] These changes do not require tests because the existing test should cover this code.

<!-- 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/21879)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 10, 2018

💔 Test failed - status-taskcluster

@ferjm
Copy link
Member

ferjm commented Oct 11, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2018

📌 Commit 7b3cf27 has been approved by ferjm

@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2018

Testing commit 7b3cf27 with merge ae0a5a8...

bors-servo added a commit that referenced this pull request Oct 11, 2018
Add task source for media element

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #21612 .
- [x] These changes do not require tests because the existing test should cover this code.

<!-- 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/21879)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2018

💔 Test failed - linux-rel-wpt

@CYBAI
Copy link
Collaborator

CYBAI commented Oct 11, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Oct 11, 2018

@bors-servo bors-servo merged commit 7b3cf27 into servo:master Oct 11, 2018
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@ferjm ferjm added this to In progress in Media playback Nov 29, 2018
@ferjm ferjm moved this from In progress to Done in Media playback Nov 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Linked issues

Successfully merging this pull request may close these issues.

6 participants
You can’t perform that action at this time.