Add an option to XRSessionCreationOptions to specify AR sessions

environmentIntegration is the new flag, which is now queried when
requesting sessions.  Plumbing to the browser process will happen in
a followup.

Now that both AR and VR can be supported simultaneously in tests,
WebXRHitTest is made experimental and the ar_hittest layout test passes.

BUG=828321

Change-Id: I4d8f13cc7c836c608d1f4d69d07813d163cea18f
Reviewed-on: https://chromium-review.googlesource.com/1132427
Commit-Queue: Bill Orr <billorr@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575911}

chrome/test/data/xr/e2e_test_files/resources/webxr_boilerplate.js

@@ -86,7 +86,7 @@ function onRequestSession() {
       break;
     case sessionTypes.AR:
       let sessionOptions = {
-        requestAR: true,
+        environmentIntegration: true,
         outputContext: webglCanvas.getContext('xrpresent'),
       };
       xrDevice.requestSession(sessionOptions).then((session) => {

third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt

@@ -9991,6 +9991,10 @@ interface XRFrameOfReference : XRCoordinateSystem
     getter bounds
     getter emulatedHeight
     method constructor
+interface XRHitResult
+    attribute @@toStringTag
+    getter hitMatrix
+    method constructor
 interface XRInputPose
     attribute @@toStringTag
     getter emulatedPosition
@@ -10033,6 +10037,7 @@ interface XRSession : EventTarget
     method getInputSources
     method requestAnimationFrame
     method requestFrameOfReference
+    method requestHitTest
     setter baseLayer
     setter depthFar
     setter depthNear

third_party/WebKit/LayoutTests/xr/ar_hittest-expected.txt

-This is a testharness.js-based test.
-FAIL Ensures hit-test returns expected mock results promise_test: Unhandled rejection with value: "Test failed while running with the following options:\n                            { immersive: false, outputContext: [object XRPresentationContext] } NotSupportedError: The specified session configuration is not supported."
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/xr/xrDevice_requestSession_exclusive_unsupported.html

@@ -18,7 +18,7 @@ promise_test( (t) => {
       runWithUserGesture( () => {
         resolve(promise_rejects(
           t,
-          "NotAllowedError",
+          "NotSupportedError",
           magicWindowOnlyDevice.requestSession({ immersive: true })
         ))
       });

third_party/blink/renderer/modules/xr/xr_device.cc

@@ -59,30 +59,12 @@ const char* XRDevice::checkSessionSupport(
     }
   }
 
-  // TODO(https://crbug.com/828321): Use session options instead of the flag.
-  bool is_ar = RuntimeEnabledFeatures::WebXRHitTestEnabled();
-  if (is_ar) {
-    if (!supports_ar_) {
-      return kSessionNotSupported;
-    }
+  if (options.environmentIntegration() && !supports_ar_) {
+    return kSessionNotSupported;
+  }
 
-    // Exclusive AR sessions aren't supported, but we could do exclusive without
-    // AR.  Since is_ar isn't based on options, assume for now that non-ar was
-    // desired.
-    // TODO(https://crbug.com/828321): Actually use options to check for AR.
-    if (options.immersive()) {
-      return nullptr;
-    }
-  } else {
-    // TODO(https://crbug.com/828321): Remove this check when properly
-    // supporting multiple VRDevice registration.
-    if (supports_ar_) {
-      // We don't expect to get an AR-capable device, but it can happen in
-      // layout tests, due to mojo mocking. For now just reject the session
-      // request.
-      return kSessionNotSupported;
-    }
-    // TODO(https://crbug.com/828321): Check that VR is supported.
+  if (options.immersive() && !supports_immersive_) {
+    return kSessionNotSupported;
   }
 
   return nullptr;
@@ -178,8 +160,7 @@ ScriptPromise XRDevice::requestSession(
   }
 
   // All AR sessions require a user gesture.
-  // TODO(https://crbug.com/828321): Use session options instead.
-  if (RuntimeEnabledFeatures::WebXRHitTestEnabled()) {
+  if (options.environmentIntegration()) {
     if (!has_user_activation) {
       return ScriptPromise::RejectWithDOMException(
           script_state, DOMException::Create(DOMExceptionCode::kSecurityError,
@@ -194,8 +175,7 @@ ScriptPromise XRDevice::requestSession(
       device::mojom::blink::XRSessionOptions::New();
   session_options->immersive = options.immersive();
   session_options->provide_passthrough_camera =
-      RuntimeEnabledFeatures::WebXRHitTestEnabled() &&
-      !session_options->immersive;
+      options.environmentIntegration();
   session_options->has_user_activation = has_user_activation;
 
   // TODO(offenwanger): Once device activation is sorted out for WebXR, either
@@ -228,13 +208,13 @@ void XRDevice::OnRequestSessionReturned(
   }
 
   XRSession::EnvironmentBlendMode blend_mode = XRSession::kBlendModeOpaque;
-  // TODO(https://crbug.com/828321): Use session options instead of the flag.
-  if (RuntimeEnabledFeatures::WebXRHitTestEnabled()) {
+  if (options.environmentIntegration()) {
     blend_mode = XRSession::kBlendModeAlphaBlend;
   }
 
   XRSession* session =
-      new XRSession(this, options.immersive(), output_context, blend_mode);
+      new XRSession(this, options.immersive(), options.environmentIntegration(),
+                    output_context, blend_mode);
   sessions_.insert(session);
 
   if (options.immersive()) {

third_party/blink/renderer/modules/xr/xr_frame_provider.cc

@@ -184,6 +184,15 @@ void XRFrameProvider::RequestFrame(XRSession* session) {
   ScheduleNonImmersiveFrame();
 }
 
+bool XRFrameProvider::HasARSession() {
+  for (unsigned i = 0; i < requesting_sessions_.size(); ++i) {
+    XRSession* session = requesting_sessions_.at(i).Get();
+    if (session->environmentIntegration())
+      return true;
+  }
+  return false;
+}
+
 void XRFrameProvider::ScheduleImmersiveFrame() {
   TRACE_EVENT0("gpu", __FUNCTION__);
   if (pending_immersive_vsync_)
@@ -228,8 +237,7 @@ void XRFrameProvider::ScheduleNonImmersiveFrame() {
   // with pass-through technology.
 
   // TODO(http://crbug.com/856257) Remove the special casing for AR and non-AR.
-  if (!device_->xrDisplayInfoPtr()
-           ->capabilities->can_provide_pass_through_images) {
+  if (!HasARSession()) {
     doc->RequestAnimationFrame(new XRFrameProviderRequestCallback(this));
   }
 }
@@ -310,8 +318,7 @@ void XRFrameProvider::OnNonImmersiveFrameData(
 
   double timestamp = frame_data->time_delta.InSecondsF();
 
-  if (device_->xrDisplayInfoPtr()
-          ->capabilities->can_provide_pass_through_images) {
+  if (HasARSession()) {
     Platform::Current()->CurrentThread()->GetTaskRunner()->PostTask(
         FROM_HERE,
         WTF::Bind(&XRFrameProvider::ProcessScheduledFrame,

third_party/blink/renderer/modules/xr/xr_frame_provider.h

@@ -57,6 +57,8 @@ class XRFrameProvider final
   void ProcessScheduledFrame(device::mojom::blink::XRFrameDataPtr frame_data,
                              double timestamp);
 
+  bool HasARSession();
+
   const Member<XRDevice> device_;
   Member<XRSession> immersive_session_;
   Member<XRFrameTransport> frame_transport_;

third_party/blink/renderer/modules/xr/xr_session.cc

@@ -91,10 +91,12 @@ class XRSession::XRSessionResizeObserverDelegate final
 
 XRSession::XRSession(XRDevice* device,
                      bool immersive,
+                     bool environment_integration,
                      XRPresentationContext* output_context,
                      EnvironmentBlendMode environment_blend_mode)
     : device_(device),
       immersive_(immersive),
+      environment_integration_(environment_integration),
       output_context_(output_context),
       callback_collection_(new XRFrameRequestCallbackCollection(
           device->xr()->GetExecutionContext())) {

third_party/blink/renderer/modules/xr/xr_session.h

@@ -46,12 +46,14 @@ class XRSession final : public EventTargetWithInlineData {
 
   XRSession(XRDevice*,
             bool immersive,
+            bool environment_integration,
             XRPresentationContext* output_context,
             EnvironmentBlendMode environment_blend_mode);
   ~XRSession() override = default;
 
   XRDevice* device() const { return device_; }
   bool immersive() const { return immersive_; }
+  bool environmentIntegration() const { return environment_integration_; }
   XRPresentationContext* outputContext() const { return output_context_; }
   const String& environmentBlendMode() const { return blend_mode_string_; }
 
@@ -163,6 +165,7 @@ class XRSession final : public EventTargetWithInlineData {
 
   const Member<XRDevice> device_;
   const bool immersive_;
+  const bool environment_integration_;
   const Member<XRPresentationContext> output_context_;
   String blend_mode_string_;
   Member<XRLayer> base_layer_;

third_party/blink/renderer/modules/xr/xr_session_creation_options.idl

@@ -6,6 +6,7 @@
 [
     SecureContext
 ] dictionary XRSessionCreationOptions {
+  [RuntimeEnabled=WebXRHitTest] boolean environmentIntegration = false;
   boolean immersive = false;
   XRPresentationContext outputContext;
 };

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1413,6 +1413,7 @@
     },
     {
       name: "WebXRHitTest",
+      status: "experimental"
     },
     {
       name: "WindowPostMessageOptions",