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

Shut down Servo when the ML app quits #22094

Merged
merged 3 commits into from Nov 6, 2018

Conversation

Projects
None yet
5 participants
@asajeffrey
Member

asajeffrey commented Nov 2, 2018

Shut down servo when shutting down the magic leap app.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because we don't test ML

This change is Reviewable

@asajeffrey asajeffrey referenced this pull request Nov 2, 2018

Closed

Package Magic Leap app #22079

2 of 2 tasks complete
let mut servo = Box::from_raw(servo);
let finish = Instant::now() + SHUTDOWN_DURATION;
'outer: while Instant::now() < finish {
servo.servo.handle_events(vec![WindowEvent::Quit]);

This comment has been minimized.

@paulrouget

paulrouget Nov 5, 2018

Contributor

Send only one quit event and then call handle_events([]).
And print a warning/error if it reaches the SHUTDOWN_DURATION limit.

This comment has been minimized.

@asajeffrey
@paulrouget

This comment has been minimized.

Contributor

paulrouget commented Nov 6, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Nov 6, 2018

📌 Commit 6088ade has been approved by paulrouget

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Nov 6, 2018

⌛️ Testing commit 6088ade with merge e265fcf...

bors-servo added a commit that referenced this pull request Nov 6, 2018

Auto merge of #22094 - asajeffrey:magicleap-shutdown, r=paulrouget
Shut down Servo when the ML app quits

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

Shut down servo when shutting down the magic leap app.

---
<!-- 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 do not require tests because we don't test ML

<!-- 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/22094)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Nov 6, 2018

@bors-servo bors-servo merged commit 6088ade into servo:master Nov 6, 2018

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Nov 6, 2018

Ah, the needs-squash label doesn't block merging, oops.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment