Skip to content

/ servo

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

Partial support for events in WebXR #23814

Merged
merged 6 commits into from Jul 23, 2019
Merged

Partial support for events in WebXR #23814

merged 6 commits into from Jul 23, 2019
+299 −108

Conversation

@Manishearth
Copy link
Member

Manishearth commented Jul 20, 2019 •
edited by SimonSapin

Needs servo/webxr#20

r? @asajeffrey

This change is Reviewable
@highfive
Copy link

highfive commented Jul 20, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/xrrenderstate.rs, components/script/dom/webidls/XRSession.webidl, components/script/dom/xrwebgllayer.rs, components/script/dom/xrtest.rs, components/script/dom/webidls/XRLayer.webidl and 9 more
  • @KiChjang: components/script/dom/xrrenderstate.rs, components/script/dom/webidls/XRSession.webidl, components/script/dom/xrwebgllayer.rs, components/script/dom/xrtest.rs, components/script/dom/webidls/XRLayer.webidl and 9 more
@Manishearth Manishearth mentioned this pull request Jul 20, 2019
Merged
@Manishearth Manishearth force-pushed the Manishearth:events branch from 26b2942 to 0fde8cd Jul 22, 2019
@asajeffrey
asajeffrey approved these changes Jul 22, 2019
View changes
Copy link
Member

asajeffrey left a comment

Looks good!
Cargo.lock Outdated
@@ -5800,6 +5809,7 @@ dependencies = [
"checksum erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3beee4bc16478a1b26f2e80ad819a52d24745e292f521a63c16eea5f74b7eb60"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
"checksum euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7a4719a544a67ed3fc33784c2bd2c6581663dfe83b719a6ae05c6dabc3b51c73"
"checksum euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4786521fec183792e755bf32cd0188e4e7628c6d0fcfd51426435b9081a106"

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Jul 22, 2019

Member

Hmm, we're dup'ing euclid now? Hopefully the dupe police on onto this!

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth Jul 22, 2019

Author Member

cc @Eijebong
components/script/dom/xrsession.rs
.Context()
.Canvas()
.upcast::<Node>()
.dirty(NodeDamage::OtherNodeDamage);

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Jul 22, 2019

Member

This is much nicer now we don't have XRLayer!

This comment has been minimized.

Sign in to view
@Manishearth

Manishearth Jul 22, 2019

Author Member

yay
Manishearth added 5 commits Jul 19, 2019
@Manishearth
Update webxr
59d879b
@Manishearth
Attach XR event callbacks
c920437
@Manishearth
Add XRSessionEvent
638cc92
@Manishearth
Support end events and end()
b66cbd3
@Manishearth
Make use of ended flag, get rid of XRLayer
b0002a0
@Manishearth Manishearth force-pushed the Manishearth:events branch from 0fde8cd to c4ac61c Jul 22, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Jul 22, 2019

@bors-servo r=asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jul 22, 2019

📌 Commit c4ac61c has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jul 23, 2019

⌛ Testing commit c4ac61c with merge 3d9dbbf...
bors-servo added a commit that referenced this pull request Jul 23, 2019
@bors-servo
Auto merge of #23814 - Manishearth:events, r=asajeffrey
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3d9dbbf 
Partial support for events in WebXR

Needs servo/webxr#20

r? @asajeffrey

<!-- 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/23814)
<!-- Reviewable:end -->
@CYBAI
Copy link
Collaborator

CYBAI commented Jul 23, 2019 

Diff in /repo/components/script/dom/xrsession.rs at line 395:
         // shuts itself down
         self.ended.set(true);
         global.as_window().Navigator().Xr().end_session(self);
�[31m-        self.session
�(B�[m�[31m-            .borrow_mut()
�(B�[m�[31m-            .end_session();
�(B�[m�[32m+        self.session.borrow_mut().end_session();
�(B�[m         p
     }
 }
Run `./mach fmt` to fix the formatting
@bors-servo
Copy link
Contributor

bors-servo commented Jul 23, 2019

💔 Test failed - linux-rel-wpt
@Manishearth Manishearth force-pushed the Manishearth:events branch from c4ac61c to e7bfacf Jul 23, 2019
@Manishearth
Support XRTest.disconnectAllDevices()
Loading status checks…
3f95d30
@Manishearth Manishearth force-pushed the Manishearth:events branch from e7bfacf to 3f95d30 Jul 23, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Jul 23, 2019

@bors-servo r=asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jul 23, 2019

📌 Commit 3f95d30 has been approved by asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented Jul 23, 2019

⌛ Testing commit 3f95d30 with merge 7afe215...
bors-servo added a commit that referenced this pull request Jul 23, 2019
@bors-servo
Auto merge of #23814 - Manishearth:events, r=asajeffrey
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7afe215 
Partial support for events in WebXR

Needs servo/webxr#20

r? @asajeffrey

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

jdm commented Jul 23, 2019 

{
    "status": "TIMEOUT", 
    "group": "default", 
    "message": "Test timed out", 
    "stack": null, 
    "subtest": "Calling end during an input callback stops processing at the right time", 
    "test": "/webxr/xrSession_input_events_end.https.html", 
    "line": 50304, 
    "action": "test_result", 
    "expected": "FAIL"
}
{
    "status": "TIMEOUT", 
    "group": "default", 
    "message": null, 
    "stack": null, 
    "subtest": null, 
    "test": "/webxr/xrSession_input_events_end.https.html", 
    "line": 50305, 
    "action": "test_result", 
    "expected": "ERROR"
}
@jdm
Copy link
Member

jdm commented Jul 23, 2019

Looks like the same failure mode as #23796
@bors-servo
Copy link
Contributor

bors-servo commented Jul 23, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: asajeffrey
Pushing 7afe215 to master...
@bors-servo bors-servo merged commit 3f95d30 into servo:master Jul 23, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asajeffrey asajeffrey

Assignees

@asajeffrey asajeffrey

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Manishearth @highfive @bors-servo @CYBAI @jdm @asajeffrey
You can’t perform that action at this time.