Skip to content

Commit fa48ada

Browse files
himorinhimorin
authored
Merge branch 'main' into archive-cr-202203
2 parents 38cdf32 + 66f8949 commit fa48ada

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎.github/workflows/auto-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
W3C_ECHIDNA_TOKEN: ${{ secrets.W3C_TR_TOKEN }}
2424
W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-immersive-web-wg/2021Sep/0004.html
2525
W3C_BUILD_OVERRIDE: |
26-
status: WD
26+
status: CRD
2727
2828
# not set 'warning' to BUILD_FAIL_ON (not to cause error by bikeshed warning?)
2929

‎index.bs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ spec:permissions-1;
3737
type:dfn; text:powerful feature
3838
spec:webidl;
3939
type:dfn; text:new
40+
type:interface; text:any
4041
spec:webxr-ar-module-1;
4142
type:dfn; text:first-person observer view
4243
spec:html; type:interface; text:Navigator
@@ -90,7 +91,6 @@ spec:html; urlPrefix: https://html.spec.whatwg.org/multipage/
9091
type: method; for:HTMLCanvasElement; text:getContext(contextId); url: canvas.html#dom-canvas-getcontext
9192
type: method; for:Window; text:requestAnimationFrame(callback); url: imagebitmap-and-animations.html#dom-animationframeprovider-requestanimationframe
9293
type: dfn; text: currently focused area; url: interaction.html#currently-focused-area-of-a-top-level-browsing-context
93-
type: dfn; text: responsible; url: webappapis.html#responsible-document
9494
type: dfn; text: rendering opportunity; url: webappapis.html#rendering-opportunity
9595
type: dfn; text: current realm; url: webappapis.html#current
9696
type: dfn; text: same origin-domain; url: origin.html#same-origin-domain
@@ -2588,7 +2588,7 @@ Starting an {{XRSessionMode/"inline"}} session does not implicitly carry the sam
25882588
To determine if an <dfn>inline session request is allowed</dfn> for a given |global object| the user agent MUST run the following steps:
25892589

25902590
1. If the session request contained any [=required features=] or [=optional features=] and the request was not made while the |global object| has [=transient activation=] or when [=launching a web application=], return `false`.
2591-
1. If the requesting document is not [=responsible=], return `false`.
2591+
1. If the |global object| is not a {{Window}}, return `false`.
25922592
1. Return `true`.
25932593

25942594
</div>
@@ -2817,7 +2817,30 @@ interface XRPermissionStatus: PermissionStatus {
28172817
</dd>
28182818

28192819

2820-
<dt>[=permission request algorithm=]</dt>
2820+
<dt>[=permission query algorithm=]</dt>
2821+
<dd>
2822+
<div class=algorithm data-algorithm="xr-permission-query-algorithm">
2823+
To query the "xr" permission with an {{XRPermissionDescriptor}} |descriptor| and a {{XRPermissionStatus}} |status|, the UA MUST run the following steps:
2824+
2825+
1. Set |status|'s {{PermissionStatus/state}} to |descriptor|'s [=permission state=].
2826+
1. If |status|'s {{PermissionStatus/state}} is {{PermissionState/"denied"}}, set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}} and abort these steps.
2827+
1. Let |result| be the result of [=resolve the requested features|resolving the requested features=] given |descriptor|'s {{XRPermissionDescriptor/requiredFeatures}}, {{XRPermissionDescriptor/optionalFeatures}}, and {{XRPermissionDescriptor/mode}}.
2828+
1. If |result| is `null`, run the following steps:
2829+
1. Set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}}.
2830+
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"denied"}}.
2831+
1. Abort these steps.
2832+
1. Let (|consentRequired|, |consentOptional|, |granted|) be the fields of |result|.
2833+
1. Set |status|'s {{XRPermissionStatus/granted}} to |granted|.
2834+
1. If |consentRequired| [=list/is empty=] and |consentOptional| [=list/is empty=], set |status|'s {{PermissionStatus/state}} to {{PermissionState/"granted"}} and abort these steps
2835+
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"prompt"}}.
2836+
2837+
</div>
2838+
2839+
</dd>
2840+
2841+
2842+
2843+
<dt>permission request algorithm</dt>
28212844
<dd>
28222845
<div class=algorithm data-algorithm="xr-permission-request-algorithm">
28232846
To <dfn lt="request the xr permission">request the "xr" permission</dfn> with an {{XRPermissionDescriptor}} |descriptor| and a {{XRPermissionStatus}} |status|, the UA MUST run the following steps:
@@ -2848,29 +2871,6 @@ Note: The user agent has the freedom to batch up permissions prompts for all req
28482871

28492872
Note: When determining [=user intent=] for a web application, user agents must check that it was explicitly [=launching a web application|launched by the user=] as a web application. They must NOT just check if the [=origin=] matches that of an installed web application.
28502873
</div>
2851-
2852-
2853-
<dt>[=permission query algorithm=]</dt>
2854-
<dd>
2855-
<div class=algorithm data-algorithm="xr-permission-query-algorithm">
2856-
To query the "xr" permission with an {{XRPermissionDescriptor}} |descriptor| and a {{XRPermissionStatus}} |status|, the UA MUST run the following steps:
2857-
2858-
1. Set |status|'s {{PermissionStatus/state}} to |descriptor|'s [=permission state=].
2859-
1. If |status|'s {{PermissionStatus/state}} is {{PermissionState/"denied"}}, set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}} and abort these steps.
2860-
1. Let |result| be the result of [=resolve the requested features|resolving the requested features=] given |descriptor|'s {{XRPermissionDescriptor/requiredFeatures}}, {{XRPermissionDescriptor/optionalFeatures}}, and {{XRPermissionDescriptor/mode}}.
2861-
1. If |result| is `null`, run the following steps:
2862-
1. Set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}}.
2863-
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"denied"}}.
2864-
1. Abort these steps.
2865-
1. Let (|consentRequired|, |consentOptional|, |granted|) be the fields of |result|.
2866-
1. Set |status|'s {{XRPermissionStatus/granted}} to |granted|.
2867-
1. If |consentRequired| [=list/is empty=] and |consentOptional| [=list/is empty=], set |status|'s {{PermissionStatus/state}} to {{PermissionState/"granted"}} and abort these steps
2868-
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"prompt"}}.
2869-
2870-
</div>
2871-
2872-
</dd>
2873-
28742874
</dl>
28752875

28762876
<div class="algorithm" data-algorithm="resolve-features">
@@ -2921,7 +2921,7 @@ Changes from the <a href="https://www.w3.org/TR/2020/WD-webxr-20200724/">Working
29212921
- Fixed up predictedDisplayTime and defined inline behavior (<a href="https://github.com/immersive-web/webxr/pull/1230">GitHub #1230</a>)
29222922
- Add XRFrame.predictedDisplayTime (<a href="https://github.com/immersive-web/webxr/pull/1217">GitHub #1217</a>)
29232923
- Add support for targetFrameRate and supportedFrameRates (<a href="https://github.com/immersive-web/webxr/pull/1201">GitHub #1201</a>)
2924-
- Add support for foveation ([=XRWebGLLayer/fixedFoveation=] (<a href="https://github.com/immersive-web/webxr/pull/1195">GitHub #1195</a>)
2924+
- Add support for foveation ({{XRWebGLLayer/fixedFoveation}} (<a href="https://github.com/immersive-web/webxr/pull/1195">GitHub #1195</a>)
29252925
- Only allow sessions to use features they explicity request or are implicitly granted based on mode (<a href="https://github.com/immersive-web/webxr/pull/1189">GitHub #1189</a>)
29262926
- Enhance examples of implicit user intent (<a href="https://github.com/immersive-web/webxr/pull/1188">GitHub #1188</a>)
29272927
- Added support for angular and linear velocity (<a href="https://github.com/immersive-web/webxr/pull/1182">GitHub #1182</a>)
@@ -2964,7 +2964,7 @@ Changes:
29642964
- Clarify threading nature of "ensure an immersive device is selected", deprecate xrCompatible (<a href="https://github.com/immersive-web/webxr/pull/1081">GitHub #1081</a>)
29652965
- Clarify some things about native origins (<a href="https://github.com/immersive-web/webxr/pull/1071">GitHub #1071</a>)
29662966
- Change document visibility check to be UA choice (<a href="https://github.com/immersive-web/webxr/pull/1067">GitHub #1067</a>)
2967-
- added 'check the layers state' algorithm (<a href="https://github.com/immersive-web/webxr/pull/1064">GitHub #1064</a>)
2967+
- added \'check the layers state\' algorithm (<a href="https://github.com/immersive-web/webxr/pull/1064">GitHub #1064</a>)
29682968
- Various changes around null and emulated poses (<a href="https://github.com/immersive-web/webxr/pull/1058">GitHub #1058</a>)
29692969
- Mention correct input frame semantics on XRInputSource/frame (<a href="https://github.com/immersive-web/webxr/pull/1053">GitHub #1053</a>)
29702970
- Added validation for XRRigidTransform (<a href="https://github.com/immersive-web/webxr/pull/1043">GitHub #1043</a>)
@@ -3040,8 +3040,8 @@ Changes:
30403040
- Disallow stereo inline sessions for now (<a href="https://github.com/immersive-web/webxr/pull/829">GitHub #829</a>)
30413041
- Handle detached buffers in projectionMatrix (<a href="https://github.com/immersive-web/webxr/pull/830">GitHub #830</a>)
30423042
- Ensure an immersive device is selected in makeXRCompatible() (<a href="https://github.com/immersive-web/webxr/pull/809">GitHub #809</a>)
3043-
- Change features to a sequence of 'any' (<a href="https://github.com/immersive-web/webxr/pull/807">GitHub #807</a>)
3044-
- Link to 'fire an input source' algorithm, explicitly construct frame (<a href="https://github.com/immersive-web/webxr/pull/797">GitHub #797</a>)
3043+
- Change features to a sequence of \'any\' (<a href="https://github.com/immersive-web/webxr/pull/807">GitHub #807</a>)
3044+
- Link to \'fire an input source\' algorithm, explicitly construct frame (<a href="https://github.com/immersive-web/webxr/pull/797">GitHub #797</a>)
30453045
- Remove Environment blend mode from spec and explainer (<a href="https://github.com/immersive-web/webxr/pull/804">GitHub #804</a>)
30463046
- Provide descriptions for each method (<a href="https://github.com/immersive-web/webxr/pull/798">GitHub #798</a>)
30473047
- Require UAs to show manual device activation steps (<a href="https://github.com/immersive-web/webxr/pull/799">GitHub #799</a>)
@@ -3057,7 +3057,7 @@ Changes:
30573057
- Use TAG recommendations for returning promises (<a href="https://github.com/immersive-web/webxr/pull/700">GitHub #700</a>)
30583058
- Move racy parts of requestSession() to the main thread (<a href="https://github.com/immersive-web/webxr/pull/706">GitHub #706</a>)
30593059
- Clarify that small overlay UIs are allowed in exclusive access (<a href="https://github.com/immersive-web/webxr/pull/709">GitHub #709</a>)
3060-
- Merge 'end the session' with 'shut down the session', clarify, add onend event (<a href="https://github.com/immersive-web/webxr/pull/710">GitHub #710</a>)
3060+
- Merge \'end the session\' with \'shut down the session\', clarify, add onend event (<a href="https://github.com/immersive-web/webxr/pull/710">GitHub #710</a>)
30613061
- Don't check XR compat flag for inline sessions (<a href="https://github.com/immersive-web/webxr/pull/705">GitHub #705</a>)
30623062
- Validate position DOMPointInit (<a href="https://github.com/immersive-web/webxr/pull/568">GitHub #568</a>)
30633063
- Explicitly spec out native origins (<a href="https://github.com/immersive-web/webxr/pull/621">GitHub #621</a>)
@@ -3076,7 +3076,7 @@ Changes:
30763076
- Fix detached array in XRRay.matrix algorithm (<a href="https://github.com/immersive-web/webxr/pull/716">GitHub #716</a>)
30773077
- Simplify handling of unsupported modes in requestSession() (<a href="https://github.com/immersive-web/webxr/pull/714">GitHub #714</a>)
30783078
- Some XRRenderState clarifications (<a href="https://github.com/immersive-web/webxr/pull/703">GitHub #703</a>)
3079-
- Replace 'list of pending render states' with 'pending render state' (<a href="https://github.com/immersive-web/webxr/pull/701">GitHub #701</a>)
3079+
- Replace \'list of pending render states\' with \'pending render state\' (<a href="https://github.com/immersive-web/webxr/pull/701">GitHub #701</a>)
30803080
- Better define gamepad placeholder buttons and axes (<a href="https://github.com/immersive-web/webxr/pull/661">GitHub #661</a>)
30813081
- Clarify what value a touchpad should report when not being touched (<a href="https://github.com/immersive-web/webxr/pull/660">GitHub #660</a>)
30823082
- Rename getPose arg referenceSpace->baseSpace (<a href="https://github.com/immersive-web/webxr/pull/659">GitHub #659</a>)
@@ -3101,7 +3101,7 @@ Changes:
31013101
- Move outputContext to XRRenderState (<a href="https://github.com/immersive-web/webxr/pull/536">GitHub #536</a>)
31023102
- Specify that getViewerPose throws an error for non-rAF XRFrames (<a href="https://github.com/immersive-web/webxr/pull/535">GitHub #535</a>)
31033103
- Remove viewMatrix and add XRTransform.inverse() (<a href="https://github.com/immersive-web/webxr/pull/531">GitHub #531</a>)
3104-
- Changed XRHandedness enum to use 'none' instead of '' (<a href="https://github.com/immersive-web/webxr/pull/526">GitHub #526</a>)
3104+
- Changed XRHandedness enum to use \'none\' instead of \'\' (<a href="https://github.com/immersive-web/webxr/pull/526">GitHub #526</a>)
31053105
- Indicate the preferred ergonomics of a tracked-pointer ray (<a href="https://github.com/immersive-web/webxr/pull/524">GitHub #524</a>)
31063106
- Clarify XRRay constructor and define normalization (<a href="https://github.com/immersive-web/webxr/pull/521">GitHub #521</a>)
31073107
- Spec text for the identity reference space (<a href="https://github.com/immersive-web/webxr/pull/520">GitHub #520</a>)

0 commit comments

Comments
 (0)