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

StereoPannerNode DOM #23281

Merged
merged 2 commits into from May 1, 2019
Merged

StereoPannerNode DOM #23281

merged 2 commits into from May 1, 2019

Conversation

@PurpleHairEngineer
Copy link
Contributor

@PurpleHairEngineer PurpleHairEngineer commented Apr 27, 2019

This is the DOM implementation for StereoPannerNode. Backend implemented in servo/media#243.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #___ (GitHub issue number if applicable)
  • There are tests for these changes OR
  • These changes do not require tests because ___

This change is Reviewable

@highfive
Copy link

@highfive highfive commented Apr 27, 2019

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @SimonSapin (or someone else) soon.

@highfive
Copy link

@highfive highfive commented Apr 27, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/baseaudiocontext.rs, components/script/dom/mod.rs, components/script/dom/stereopannernode.rs, components/script/dom/webidls/BaseAudioContext.webidl, components/script/dom/webidls/StereoPannerNode.webidl
  • @KiChjang: components/script/dom/baseaudiocontext.rs, components/script/dom/mod.rs, components/script/dom/stereopannernode.rs, components/script/dom/webidls/BaseAudioContext.webidl, components/script/dom/webidls/StereoPannerNode.webidl

@highfive
Copy link

@highfive highfive commented Apr 27, 2019

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!

@jdm
Copy link
Member

@jdm jdm commented Apr 27, 2019

@highfive highfive assigned Manishearth and unassigned SimonSapin Apr 27, 2019
@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 27, 2019

@Manishearth Okay, I believe I added the constraints appropriately. Thank you.

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented Apr 29, 2019

The latest upstream changes (presumably #22743) made this pull request unmergeable. Please resolve the merge conflicts.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 29, 2019

@Manishearth I see that there are build errors for this, but a lot of them seem to be related to the fact that it can't find stereo_panner_node in servo_media. That's being implemented in a different pull request, servo/media#243 . Is there anything else I can do for this one before I get that one working?

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 29, 2019

Nah, get that one working first. There's a way to locally redirect dependencies but I'd rather just merge that first and look at this one later.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth Now that servo/media#243 has been merged, what is the best way to update this branch to reflect those changes? Should I pull the master branch, or something else?

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

./mach cargo update -p servo-media should be enough. Commit the changes it causes.

Also, you should first rebase and squash this (there will be a small merge conflict that needs fixing) so you won't have the same problem you had in the other PR.

Ideally if you can, make the commit that updates servo-media a separate commit before the main one (it's easier to rebase this in case of lockfile issues), but don't worry about that if you don't know how.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth Are you saying I should squash before running the /mach cargo update -p servo-media command? When I tried to run git rebase -i HEAD~5, it showed my commits at the top and then almost 400 commits after that. Are you saying I should squash them all?

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

git rebase -i HEAD~5

Run git fetch origin and then git rebase -i origin/master. Only squash your commits, no other commits should show up. I can do it for you if you need.

Yes, squash first.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth I ran git rebase -i origin/master, but in the editor, it is showing my 4 commits on top followed by about 390 others. What should I do? I don't want to close the editor because I know it does the rebasing even if I close it without making any changes.

@jdm
Copy link
Member

@jdm jdm commented Apr 30, 2019

If you remove all of the entries and close the editor, the rebase will be cancelled without making any changes.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@jdm Thanks for the tip! Sorry, I don't have a lot of experience using git before this project.

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

On a bus right now, will push later. Is origin the servo repo or your fork? If it's your fork, do git remote add upstream https://github.com/servo/servo.git and then use git rebase -i upstream/master.

This worked for me locally.

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth origin is the fork (https://github.com/josephhutch/servo). Thanks! I had to run git fetch in between those two commands, but I think it worked!

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

Pushed. I also included the update of servo-media.

Run the following to get the update locally

git fetch origin
git checkout origin/StereoPannerNode
git checkout -B StereoPannerNode
git push origin StereoPannerNode -u

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth I'm getting the following build error:

error[E0599]: no variant or associated item named `StereoPannerNode` found for type `dom::bindings::codegen::InheritTypes::AudioNodeTypeId` in the current scope
   --> components\script\dom\audionode.rs:288:59
    |
288 |             EventTargetTypeId::AudioNode(AudioNodeTypeId::StereoPannerNode) => {
    |                                                           ^^^^^^^^^^^^^^^^ variant or associated item not found in `dom::bindings::codegen::InheritTypes::AudioNodeTypeId`

I've searched the repo for AudioNodeTypeId, but I can't figure out where I need to add StereoPannerNode in order to get rid of this error?

Copy link
Member

@Manishearth Manishearth left a comment

this gets subclassed twice, so the type id is a bit more complex

components/script/dom/audionode.rs Outdated Show resolved Hide resolved
components/script/dom/audionode.rs Outdated Show resolved Hide resolved
@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented Apr 30, 2019

@Manishearth This builds without issues for me now and I ran rustfmt on the relevant files. Could you please take a look?

Copy link
Member

@Manishearth Manishearth left a comment

Looks good!

Now we need to update test expectations. Please run

./mach test-wpt /webaudio/the-audio-api --log-raw log
./mach update-wpt log

and commit the changes

components/script/dom/stereopannernode.rs Outdated Show resolved Hide resolved
@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

bors-servo added a commit that referenced this issue Apr 30, 2019
StereoPannerNode DOM

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

This is the DOM implementation for StereoPannerNode. Backend implemented in servo/media#243.

---
<!-- 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
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- 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/23281)
<!-- Reviewable:end -->
@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented Apr 30, 2019

📌 Commit e22c005 has been approved by Manishearth

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented Apr 30, 2019

Testing commit e22c005 with merge 4d5f4b8...

bors-servo added a commit that referenced this issue Apr 30, 2019
StereoPannerNode DOM

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

This is the DOM implementation for StereoPannerNode. Backend implemented in servo/media#243.

---
<!-- 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
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

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

@bors-servo bors-servo commented Apr 30, 2019

💔 Test failed - linux-rel-wpt

@Manishearth
Copy link
Member

@Manishearth Manishearth commented Apr 30, 2019

@bors r+

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented May 1, 2019

@Manishearth Thank you so much for all your help! It looks like you approved the merge but it is still open. Is there anything else I can do for this?

@Manishearth
Copy link
Member

@Manishearth Manishearth commented May 1, 2019

No, our CI robot will eventually test and merge this

@PurpleHairEngineer
Copy link
Contributor Author

@PurpleHairEngineer PurpleHairEngineer commented May 1, 2019

@Manishearth Oh okay, I was just wondering because it has the label awaiting review.

@Manishearth
Copy link
Member

@Manishearth Manishearth commented May 1, 2019

@bors-servo r+

ah, did it the wrong way

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented May 1, 2019

📌 Commit 58f0274 has been approved by Manishearth

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented May 1, 2019

Testing commit 58f0274 with merge aa63d60...

bors-servo added a commit that referenced this issue May 1, 2019
StereoPannerNode DOM

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

This is the DOM implementation for StereoPannerNode. Backend implemented in servo/media#243.

---
<!-- 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
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

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

@bors-servo bors-servo commented May 1, 2019

@bors-servo bors-servo merged commit 58f0274 into servo:master May 1, 2019
4 checks passed
@bors-servo bors-servo mentioned this pull request May 1, 2019
5 tasks
@bors-servo bors-servo mentioned this pull request May 1, 2019
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants