Skip to content

Commit

Permalink
Merge branch 'main' into archive-cr-202203
Browse files Browse the repository at this point in the history
  • Loading branch information
@himorin
himorin authored Apr 1, 2022
2 parents 38cdf32 + 66f8949 commit fa48ada
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
W3C_ECHIDNA_TOKEN: ${{ secrets.W3C_TR_TOKEN }}
W3C_WG_DECISION_URL: https://lists.w3.org/Archives/Public/public-immersive-web-wg/2021Sep/0004.html
W3C_BUILD_OVERRIDE: |
status: WD
status: CRD
# not set 'warning' to BUILD_FAIL_ON (not to cause error by bikeshed warning?)

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

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`.
1. If the requesting document is not [=responsible=], return `false`.
1. If the |global object| is not a {{Window}}, return `false`.
1. Return `true`.

</div>
Expand Down Expand Up @@ -2817,7 +2817,30 @@ interface XRPermissionStatus: PermissionStatus {
</dd>


<dt>[=permission request algorithm=]</dt>
<dt>[=permission query algorithm=]</dt>
<dd>
<div class=algorithm data-algorithm="xr-permission-query-algorithm">
To query the "xr" permission with an {{XRPermissionDescriptor}} |descriptor| and a {{XRPermissionStatus}} |status|, the UA MUST run the following steps:

1. Set |status|'s {{PermissionStatus/state}} to |descriptor|'s [=permission state=].
1. If |status|'s {{PermissionStatus/state}} is {{PermissionState/"denied"}}, set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}} and abort these steps.
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}}.
1. If |result| is `null`, run the following steps:
1. Set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}}.
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"denied"}}.
1. Abort these steps.
1. Let (|consentRequired|, |consentOptional|, |granted|) be the fields of |result|.
1. Set |status|'s {{XRPermissionStatus/granted}} to |granted|.
1. If |consentRequired| [=list/is empty=] and |consentOptional| [=list/is empty=], set |status|'s {{PermissionStatus/state}} to {{PermissionState/"granted"}} and abort these steps
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"prompt"}}.

</div>

</dd>



<dt>permission request algorithm</dt>
<dd>
<div class=algorithm data-algorithm="xr-permission-request-algorithm">
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:
Expand Down Expand Up @@ -2848,29 +2871,6 @@ Note: The user agent has the freedom to batch up permissions prompts for all req

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.
</div>


<dt>[=permission query algorithm=]</dt>
<dd>
<div class=algorithm data-algorithm="xr-permission-query-algorithm">
To query the "xr" permission with an {{XRPermissionDescriptor}} |descriptor| and a {{XRPermissionStatus}} |status|, the UA MUST run the following steps:

1. Set |status|'s {{PermissionStatus/state}} to |descriptor|'s [=permission state=].
1. If |status|'s {{PermissionStatus/state}} is {{PermissionState/"denied"}}, set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}} and abort these steps.
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}}.
1. If |result| is `null`, run the following steps:
1. Set |status|'s {{XRPermissionStatus/granted}} to an empty {{FrozenArray}}.
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"denied"}}.
1. Abort these steps.
1. Let (|consentRequired|, |consentOptional|, |granted|) be the fields of |result|.
1. Set |status|'s {{XRPermissionStatus/granted}} to |granted|.
1. If |consentRequired| [=list/is empty=] and |consentOptional| [=list/is empty=], set |status|'s {{PermissionStatus/state}} to {{PermissionState/"granted"}} and abort these steps
1. Set |status|'s {{PermissionStatus/state}} to {{PermissionState/"prompt"}}.

</div>

</dd>

</dl>

<div class="algorithm" data-algorithm="resolve-features">
Expand Down Expand Up @@ -2921,7 +2921,7 @@ Changes from the <a href="https://www.w3.org/TR/2020/WD-webxr-20200724/">Working
- Fixed up predictedDisplayTime and defined inline behavior (<a href="https://github.com/immersive-web/webxr/pull/1230">GitHub #1230</a>)
- Add XRFrame.predictedDisplayTime (<a href="https://github.com/immersive-web/webxr/pull/1217">GitHub #1217</a>)
- Add support for targetFrameRate and supportedFrameRates (<a href="https://github.com/immersive-web/webxr/pull/1201">GitHub #1201</a>)
- Add support for foveation ([=XRWebGLLayer/fixedFoveation=] (<a href="https://github.com/immersive-web/webxr/pull/1195">GitHub #1195</a>)
- Add support for foveation ({{XRWebGLLayer/fixedFoveation}} (<a href="https://github.com/immersive-web/webxr/pull/1195">GitHub #1195</a>)
- 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>)
- Enhance examples of implicit user intent (<a href="https://github.com/immersive-web/webxr/pull/1188">GitHub #1188</a>)
- Added support for angular and linear velocity (<a href="https://github.com/immersive-web/webxr/pull/1182">GitHub #1182</a>)
Expand Down Expand Up @@ -2964,7 +2964,7 @@ Changes:
- 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>)
- Clarify some things about native origins (<a href="https://github.com/immersive-web/webxr/pull/1071">GitHub #1071</a>)
- Change document visibility check to be UA choice (<a href="https://github.com/immersive-web/webxr/pull/1067">GitHub #1067</a>)
- added 'check the layers state' algorithm (<a href="https://github.com/immersive-web/webxr/pull/1064">GitHub #1064</a>)
- added \'check the layers state\' algorithm (<a href="https://github.com/immersive-web/webxr/pull/1064">GitHub #1064</a>)
- Various changes around null and emulated poses (<a href="https://github.com/immersive-web/webxr/pull/1058">GitHub #1058</a>)
- Mention correct input frame semantics on XRInputSource/frame (<a href="https://github.com/immersive-web/webxr/pull/1053">GitHub #1053</a>)
- Added validation for XRRigidTransform (<a href="https://github.com/immersive-web/webxr/pull/1043">GitHub #1043</a>)
Expand Down Expand Up @@ -3040,8 +3040,8 @@ Changes:
- Disallow stereo inline sessions for now (<a href="https://github.com/immersive-web/webxr/pull/829">GitHub #829</a>)
- Handle detached buffers in projectionMatrix (<a href="https://github.com/immersive-web/webxr/pull/830">GitHub #830</a>)
- Ensure an immersive device is selected in makeXRCompatible() (<a href="https://github.com/immersive-web/webxr/pull/809">GitHub #809</a>)
- Change features to a sequence of 'any' (<a href="https://github.com/immersive-web/webxr/pull/807">GitHub #807</a>)
- Link to 'fire an input source' algorithm, explicitly construct frame (<a href="https://github.com/immersive-web/webxr/pull/797">GitHub #797</a>)
- Change features to a sequence of \'any\' (<a href="https://github.com/immersive-web/webxr/pull/807">GitHub #807</a>)
- Link to \'fire an input source\' algorithm, explicitly construct frame (<a href="https://github.com/immersive-web/webxr/pull/797">GitHub #797</a>)
- Remove Environment blend mode from spec and explainer (<a href="https://github.com/immersive-web/webxr/pull/804">GitHub #804</a>)
- Provide descriptions for each method (<a href="https://github.com/immersive-web/webxr/pull/798">GitHub #798</a>)
- Require UAs to show manual device activation steps (<a href="https://github.com/immersive-web/webxr/pull/799">GitHub #799</a>)
Expand All @@ -3057,7 +3057,7 @@ Changes:
- Use TAG recommendations for returning promises (<a href="https://github.com/immersive-web/webxr/pull/700">GitHub #700</a>)
- Move racy parts of requestSession() to the main thread (<a href="https://github.com/immersive-web/webxr/pull/706">GitHub #706</a>)
- Clarify that small overlay UIs are allowed in exclusive access (<a href="https://github.com/immersive-web/webxr/pull/709">GitHub #709</a>)
- 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>)
- 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>)
- Don't check XR compat flag for inline sessions (<a href="https://github.com/immersive-web/webxr/pull/705">GitHub #705</a>)
- Validate position DOMPointInit (<a href="https://github.com/immersive-web/webxr/pull/568">GitHub #568</a>)
- Explicitly spec out native origins (<a href="https://github.com/immersive-web/webxr/pull/621">GitHub #621</a>)
Expand All @@ -3076,7 +3076,7 @@ Changes:
- Fix detached array in XRRay.matrix algorithm (<a href="https://github.com/immersive-web/webxr/pull/716">GitHub #716</a>)
- Simplify handling of unsupported modes in requestSession() (<a href="https://github.com/immersive-web/webxr/pull/714">GitHub #714</a>)
- Some XRRenderState clarifications (<a href="https://github.com/immersive-web/webxr/pull/703">GitHub #703</a>)
- Replace 'list of pending render states' with 'pending render state' (<a href="https://github.com/immersive-web/webxr/pull/701">GitHub #701</a>)
- Replace \'list of pending render states\' with \'pending render state\' (<a href="https://github.com/immersive-web/webxr/pull/701">GitHub #701</a>)
- Better define gamepad placeholder buttons and axes (<a href="https://github.com/immersive-web/webxr/pull/661">GitHub #661</a>)
- Clarify what value a touchpad should report when not being touched (<a href="https://github.com/immersive-web/webxr/pull/660">GitHub #660</a>)
- Rename getPose arg referenceSpace->baseSpace (<a href="https://github.com/immersive-web/webxr/pull/659">GitHub #659</a>)
Expand All @@ -3101,7 +3101,7 @@ Changes:
- Move outputContext to XRRenderState (<a href="https://github.com/immersive-web/webxr/pull/536">GitHub #536</a>)
- Specify that getViewerPose throws an error for non-rAF XRFrames (<a href="https://github.com/immersive-web/webxr/pull/535">GitHub #535</a>)
- Remove viewMatrix and add XRTransform.inverse() (<a href="https://github.com/immersive-web/webxr/pull/531">GitHub #531</a>)
- Changed XRHandedness enum to use 'none' instead of '' (<a href="https://github.com/immersive-web/webxr/pull/526">GitHub #526</a>)
- Changed XRHandedness enum to use \'none\' instead of \'\' (<a href="https://github.com/immersive-web/webxr/pull/526">GitHub #526</a>)
- Indicate the preferred ergonomics of a tracked-pointer ray (<a href="https://github.com/immersive-web/webxr/pull/524">GitHub #524</a>)
- Clarify XRRay constructor and define normalization (<a href="https://github.com/immersive-web/webxr/pull/521">GitHub #521</a>)
- Spec text for the identity reference space (<a href="https://github.com/immersive-web/webxr/pull/520">GitHub #520</a>)
Expand Down

0 comments on commit fa48ada

Please sign in to comment.