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

Remove ScriptThread::layout_to_constellation_chan. #11375

Merged
merged 1 commit into from May 25, 2016

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented May 24, 2016

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 --faster 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 refactoring

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Instead, pass it along in NewLayoutInfo when needed.


This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs
  • @KiChjang: components/script/script_thread.rs, components/script_traits/lib.rs, components/script_traits/lib.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 24, 2016
@highfive
Copy link

warning Warning warning

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

@mbrubeck
Copy link
Contributor

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 7f55e70 has been approved by mbrubeck

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 24, 2016
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

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

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels May 25, 2016
@Ms2ger Ms2ger mentioned this pull request May 25, 2016
5 tasks
Instead, pass it along in NewLayoutInfo when needed.
@Ms2ger Ms2ger force-pushed the layout_to_constellation_chan branch from 7f55e70 to 4f893ee Compare May 25, 2016 13:45
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 25, 2016
@Ms2ger
Copy link
Contributor Author

Ms2ger commented May 25, 2016

@bors-servo r=mbrubeck

@bors-servo
Copy link
Contributor

📌 Commit 4f893ee has been approved by mbrubeck

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels May 25, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 4f893ee with merge f03e8fc...

bors-servo pushed a commit that referenced this pull request May 25, 2016
Remove ScriptThread::layout_to_constellation_chan.

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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because refactoring

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Instead, pass it along in NewLayoutInfo when needed.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11375)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows

@bors-servo bors-servo merged commit 4f893ee into master May 25, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 25, 2016
@Ms2ger Ms2ger deleted the layout_to_constellation_chan branch May 25, 2016 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants