WebXR - Remove legacy hit test API

The approach to performing hit test has changed, the new API that
replaces the legacy one is already enabled by default in M81.
https://immersive-web.github.io/hit-test/

Change-Id: Ia89921505ae4ed537c28b117808182efbc79396c
Fixed: 1051626
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050582Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Piotr Bialecki <bialpio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741164}

chrome/browser/android/vr/arcore_device/arcore_device_unittest.cc

@@ -222,22 +222,4 @@ TEST_F(ArCoreDeviceTest, GetFrameData) {
   GetFrameData();
 }
 
-TEST_F(ArCoreDeviceTest, RequestHitTest) {
-  CreateSession();
-
-  mojom::XRRayPtr ray = mojom::XRRay::New();
-  std::vector<mojom::XRHitResultPtr> hit_results;
-  auto callback =
-      [](std::vector<mojom::XRHitResultPtr>* hit_results,
-         base::Optional<std::vector<mojom::XRHitResultPtr>> results) {
-        *hit_results = std::move(results.value());
-      };
-
-  environment_provider->RequestHitTest(std::move(ray),
-                                       base::BindOnce(callback, &hit_results));
-  // Have to get frame data to trigger the hit-test calculation.
-  GetFrameData();
-  EXPECT_FALSE(hit_results.empty());
-}
-
 }  // namespace device

chrome/browser/android/vr/arcore_device/arcore_gl.cc

@@ -91,16 +91,6 @@ const display::Display::Rotation kDefaultRotation = display::Display::ROTATE_0;
 
 namespace device {
 
-struct ArCoreHitTestRequest {
-  ArCoreHitTestRequest() = default;
-  ~ArCoreHitTestRequest() = default;
-  mojom::XRRayPtr ray;
-  mojom::XREnvironmentIntegrationProvider::RequestHitTestCallback callback;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArCoreHitTestRequest);
-};
-
 ArCoreGl::ArCoreGl(std::unique_ptr<ArImageTransport> ar_image_transport)
     : gl_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       ar_image_transport_(std::move(ar_image_transport)),
@@ -420,11 +410,8 @@ void ArCoreGl::GetFrameData(
   fps_meter_.AddFrame(base::TimeTicks::Now());
   TRACE_COUNTER1("gpu", "WebXR FPS", fps_meter_.GetFPS());
 
-  // Post a task to finish processing the frame so any calls to
-  // RequestHitTest() that were made during this function, which can block
-  // on the arcore_->Update() call above, can be processed in this frame.
-  // Additionally, this gives a chance for OnScreenTouch() tasks to run
-  // and added anchors to be registered.
+  // Post a task to finish processing the frame to give a chance for
+  // OnScreenTouch() tasks to run and added anchors to be registered.
   gl_thread_task_runner_->PostTask(
       FROM_HERE,
       base::BindOnce(&ArCoreGl::ProcessFrame, weak_ptr_factory_.GetWeakPtr(),
@@ -641,27 +628,6 @@ void ArCoreGl::SetInputSourceButtonListener(
   mojo::ReportBadMessage("Input eventing is not supported.");
 }
 
-void ArCoreGl::RequestHitTest(
-    mojom::XRRayPtr ray,
-    mojom::XREnvironmentIntegrationProvider::RequestHitTestCallback callback) {
-  DVLOG(2) << __func__ << ": ray origin=" << ray->origin.ToString()
-           << ", direction=" << ray->direction.ToString();
-
-  DCHECK(IsOnGlThread());
-  DCHECK(is_initialized_);
-
-  if (restrict_frame_data_) {
-    std::move(callback).Run(base::nullopt);
-    return;
-  }
-
-  std::unique_ptr<ArCoreHitTestRequest> request =
-      std::make_unique<ArCoreHitTestRequest>();
-  request->ray = std::move(ray);
-  request->callback = std::move(callback);
-  hit_test_requests_.push_back(std::move(request));
-}
-
 void ArCoreGl::SubscribeToHitTest(
     mojom::XRNativeOriginInformationPtr native_origin_information,
     const std::vector<mojom::EntityTypeForHitTest>& entity_types,
@@ -807,30 +773,6 @@ void ArCoreGl::ProcessFrame(
     frame_data->light_estimation_data = arcore_->GetLightEstimationData();
   }
 
-  // The timing requirements for hit-test are documented here:
-  // https://github.com/immersive-web/hit-test/blob/master/explainer.md#timing
-  // The current implementation of frame generation on the renderer side is
-  // 1:1 with calls to this method, so it is safe to fire off the hit-test
-  // results here, one at a time, in the order they were enqueued prior to
-  // running the GetFrameDataCallback.
-  // Since mojo callbacks are processed in order, this will result in the
-  // correct sequence of hit-test callbacks / promise resolutions. If
-  // the implementation of the renderer processing were to change, this
-  // code is fragile and could break depending on the new implementation.
-  // TODO(https://crbug.com/844174): In order to be more correct by design,
-  // hit results should be bundled with the frame data - that way it would be
-  // obvious how the timing between the results and the frame should go.
-  for (auto& request : hit_test_requests_) {
-    std::vector<mojom::XRHitResultPtr> results;
-    if (arcore_->RequestHitTest(request->ray, &results)) {
-      std::move(request->callback).Run(std::move(results));
-    } else {
-      // Hit test failed, i.e. unprojected location was offscreen.
-      std::move(request->callback).Run(base::nullopt);
-    }
-  }
-  hit_test_requests_.clear();
-
   // Running this callback after resolving all the hit-test requests ensures
   // that we satisfy the guarantee of the WebXR hit-test spec - that the
   // hit-test promise resolves immediately prior to the frame for which it is

chrome/browser/android/vr/arcore_device/arcore_gl.h

@@ -49,7 +49,6 @@ namespace device {
 
 class ArCore;
 class ArCoreFactory;
-struct ArCoreHitTestRequest;
 class ArImageTransport;
 
 using ArCoreGlCreateSessionCallback = base::OnceCallback<void(
@@ -110,10 +109,6 @@ class ArCoreGl : public mojom::XRFrameDataProvider,
                          const gfx::Size& source_size) override;
 
   // XREnvironmentIntegrationProvider
-  void RequestHitTest(
-      mojom::XRRayPtr,
-      mojom::XREnvironmentIntegrationProvider::RequestHitTestCallback) override;
-
   void SubscribeToHitTest(
       mojom::XRNativeOriginInformationPtr native_origin_information,
       const std::vector<mojom::EntityTypeForHitTest>& entity_types,
@@ -231,8 +226,6 @@ class ArCoreGl : public mojom::XRFrameDataProvider,
 
   FPSMeter fps_meter_;
 
-  std::vector<std::unique_ptr<ArCoreHitTestRequest>> hit_test_requests_;
-
   mojo::Receiver<mojom::XRFrameDataProvider> frame_data_receiver_{this};
   mojo::Receiver<mojom::XRSessionController> session_controller_receiver_{this};
   mojo::AssociatedReceiver<mojom::XREnvironmentIntegrationProvider>

device/vr/public/mojom/vr_service.mojom

@@ -662,14 +662,6 @@ enum EntityTypeForHitTest {
 // all outstanding JavaScript promises at that time. The XRsession might end for
 // example due to a call to XRSession::end() method (exposed to JavaScript).
 interface XREnvironmentIntegrationProvider {
-  // Performs a raycast into the scene and returns a list of XRHitResults sorted
-  // from closest to furthest hit from the ray. Each hit result contains a
-  // hit_matrix containing the transform of the hit where the rotation
-  // represents the normal of the surface hit.
-  // An empty result list means there were no hits. If a nullopt is returned,
-  // there was an error.
-  RequestHitTest(XRRay ray) => (array<XRHitResult>? results);
-
   // Establishes a hit test subscription on the device. The subscription results
   // will be computed taking into account latest state of the native origin
   // identified by passed in |native_origin_information|. I.e., in each frame,

device/vr/vr_device_base.cc

@@ -84,13 +84,6 @@ void VRDeviceBase::SetInlinePosesEnabled(bool enable) {
   inline_poses_enabled_ = enable;
 }
 
-void VRDeviceBase::RequestHitTest(
-    mojom::XRRayPtr ray,
-    mojom::XREnvironmentIntegrationProvider::RequestHitTestCallback callback) {
-  NOTREACHED() << "Unexpected call to a device without hit-test support";
-  std::move(callback).Run(base::nullopt);
-}
-
 void LogViewerType(VrViewerType type) {
   base::UmaHistogramSparse("VRViewerType", static_cast<int>(type));
 }

device/vr/vr_device_base.h

@@ -36,9 +36,6 @@ class DEVICE_VR_EXPORT VRDeviceBase : public mojom::XRRuntime {
   void SetInlinePosesEnabled(bool enable) override;
   void ShutdownSession(mojom::XRRuntime::ShutdownSessionCallback) override;
 
-  virtual void RequestHitTest(
-      mojom::XRRayPtr ray,
-      mojom::XREnvironmentIntegrationProvider::RequestHitTestCallback callback);
   device::mojom::XRDeviceId GetId() const;
 
   bool HasExclusiveSession();
@@ -72,7 +69,6 @@ class DEVICE_VR_EXPORT VRDeviceBase : public mojom::XRRuntime {
   bool inline_poses_enabled_ = true;
 
  private:
-
   mojo::AssociatedRemote<mojom::XRRuntimeEventListener> listener_;
 
   bool presenting_ = false;

third_party/blink/renderer/bindings/idl_in_modules.gni

@@ -915,7 +915,6 @@ static_idl_files_in_modules = get_path_info(
           "//third_party/blink/renderer/modules/xr/xr_dom_overlay_state.idl",
           "//third_party/blink/renderer/modules/xr/xr_frame.idl",
           "//third_party/blink/renderer/modules/xr/xr_frame_request_callback.idl",
-          "//third_party/blink/renderer/modules/xr/xr_hit_result.idl",
           "//third_party/blink/renderer/modules/xr/xr_hit_test_options_init.idl",
           "//third_party/blink/renderer/modules/xr/xr_hit_test_result.idl",
           "//third_party/blink/renderer/modules/xr/xr_hit_test_source.idl",

third_party/blink/renderer/modules/xr/BUILD.gn

@@ -33,8 +33,6 @@ blink_modules_sources("xr") {
     "xr_frame_request_callback_collection.h",
     "xr_grip_space.cc",
     "xr_grip_space.h",
-    "xr_hit_result.cc",
-    "xr_hit_result.h",
     "xr_hit_test_result.cc",
     "xr_hit_test_result.h",
     "xr_hit_test_source.cc",

third_party/blink/renderer/modules/xr/idls.gni

@@ -10,7 +10,6 @@ modules_idl_files = [
   "xr_dom_overlay_state.idl",
   "xr_cube_map.idl",
   "xr_frame.idl",
-  "xr_hit_result.idl",
   "xr_input_source.idl",
   "xr_input_source_array.idl",
   "xr_input_source_event.idl",

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

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "third_party/blink/renderer/modules/xr/xr_hit_result.h"
-
-#include "third_party/blink/renderer/modules/xr/xr_utils.h"
-#include "third_party/blink/renderer/platform/transforms/transformation_matrix.h"
-
-namespace blink {
-XRHitResult::XRHitResult(const TransformationMatrix& hit_transform)
-    : hit_transform_(std::make_unique<TransformationMatrix>(hit_transform)) {}
-
-XRHitResult::~XRHitResult() {}
-
-DOMFloat32Array* XRHitResult::hitMatrix() const {
-  if (!hit_transform_)
-    return nullptr;
-  return transformationMatrixToDOMFloat32Array(*hit_transform_);
-}
-
-}  // namespace blink

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

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_HIT_RESULT_H_
-#define THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_HIT_RESULT_H_
-
-#include "third_party/blink/renderer/core/typed_arrays/dom_typed_array.h"
-
-namespace blink {
-
-class TransformationMatrix;
-
-class XRHitResult final : public ScriptWrappable {
-  DEFINE_WRAPPERTYPEINFO();
-
- public:
-  explicit XRHitResult(const TransformationMatrix&);
-  ~XRHitResult() override;
-
-  DOMFloat32Array* hitMatrix() const;
-
- private:
-  const std::unique_ptr<TransformationMatrix> hit_transform_;
-};
-
-}  // namespace blink
-
-#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_HIT_RESULT_H_

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

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-[RuntimeEnabled=WebXRIncubations, SecureContext, Exposed=Window]
-interface XRHitResult {
-  readonly attribute Float32Array hitMatrix;
-};
\ No newline at end of file

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

@@ -35,7 +35,6 @@
 #include "third_party/blink/renderer/modules/xr/xr_dom_overlay_state.h"
 #include "third_party/blink/renderer/modules/xr/xr_frame.h"
 #include "third_party/blink/renderer/modules/xr/xr_frame_provider.h"
-#include "third_party/blink/renderer/modules/xr/xr_hit_result.h"
 #include "third_party/blink/renderer/modules/xr/xr_hit_test_source.h"
 #include "third_party/blink/renderer/modules/xr/xr_input_source_event.h"
 #include "third_party/blink/renderer/modules/xr/xr_input_sources_change_event.h"
@@ -73,8 +72,6 @@ const char kNoSpaceSpecified[] = "No XRSpace specified.";
 
 const char kNoRigidTransformSpecified[] = "No XRRigidTransform specified.";
 
-const char kHitTestNotSupported[] = "Device does not support hit-test!";
-
 const char kAnchorsNotSupported[] = "Device does not support anchors!";
 
 const char kDeviceDisconnected[] = "The XR device has been disconnected.";
@@ -682,50 +679,6 @@ XRInputSourceArray* XRSession::inputSources() const {
   return input_sources_;
 }
 
-ScriptPromise XRSession::requestHitTest(ScriptState* script_state,
-                                        XRRay* ray,
-                                        XRSpace* space,
-                                        ExceptionState& exception_state) {
-  DVLOG(2) << __func__;
-
-  if (ended_) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
-                                      kSessionEnded);
-    return ScriptPromise();
-  }
-
-  if (!space) {
-    exception_state.ThrowTypeError(kNoSpaceSpecified);
-    return ScriptPromise();
-  }
-
-  // Reject the promise if device doesn't support the hit-test API.
-  if (!xr_->xrEnvironmentProviderRemote()) {
-    exception_state.ThrowDOMException(DOMExceptionCode::kNotSupportedError,
-                                      kHitTestNotSupported);
-    return ScriptPromise();
-  }
-
-  device::mojom::blink::XRRayPtr ray_mojo = device::mojom::blink::XRRay::New();
-
-  ray_mojo->origin =
-      FloatPoint3D(ray->origin()->x(), ray->origin()->y(), ray->origin()->z());
-
-  ray_mojo->direction = {ray->direction()->x(), ray->direction()->y(),
-                         ray->direction()->z()};
-
-  auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
-  ScriptPromise promise = resolver->Promise();
-
-  xr_->xrEnvironmentProviderRemote()->RequestHitTest(
-      std::move(ray_mojo),
-      WTF::Bind(&XRSession::OnHitTestResults, WrapPersistent(this),
-                WrapPersistent(resolver)));
-  hit_test_promises_.insert(resolver);
-
-  return promise;
-}
-
 ScriptPromise XRSession::requestHitTestSource(
     ScriptState* script_state,
     XRHitTestOptionsInit* options_init,
@@ -866,26 +819,6 @@ ScriptPromise XRSession::requestHitTestSourceForTransientInput(
   return promise;
 }
 
-void XRSession::OnHitTestResults(
-    ScriptPromiseResolver* resolver,
-    base::Optional<Vector<device::mojom::blink::XRHitResultPtr>> results) {
-  DCHECK(hit_test_promises_.Contains(resolver));
-  hit_test_promises_.erase(resolver);
-
-  if (!results) {
-    resolver->Reject();
-    return;
-  }
-
-  HeapVector<Member<XRHitResult>> hit_results;
-  for (const auto& mojom_result : results.value()) {
-    XRHitResult* hit_result = MakeGarbageCollected<XRHitResult>(
-        TransformationMatrix(mojom_result->hit_matrix.matrix()));
-    hit_results.push_back(hit_result);
-  }
-  resolver->Resolve(hit_results);
-}
-
 void XRSession::OnSubscribeToHitTestResult(
     ScriptPromiseResolver* resolver,
     device::mojom::SubscribeToHitTestResult result,
@@ -966,13 +899,6 @@ void XRSession::EnsureEnvironmentErrorHandler() {
 }
 
 void XRSession::OnEnvironmentProviderError() {
-  HeapHashSet<Member<ScriptPromiseResolver>> hit_test_promises;
-  hit_test_promises_.swap(hit_test_promises);
-  for (ScriptPromiseResolver* resolver : hit_test_promises) {
-    resolver->Reject(MakeGarbageCollected<DOMException>(
-        DOMExceptionCode::kInvalidStateError, kDeviceDisconnected));
-  }
-
   HeapHashSet<Member<ScriptPromiseResolver>> create_anchor_promises;
   create_anchor_promises_.swap(create_anchor_promises);
   for (ScriptPromiseResolver* resolver : create_anchor_promises) {
@@ -1932,7 +1858,6 @@ void XRSession::Trace(blink::Visitor* visitor) {
   visitor->Trace(overlay_element_);
   visitor->Trace(dom_overlay_state_);
   visitor->Trace(callback_collection_);
-  visitor->Trace(hit_test_promises_);
   visitor->Trace(create_anchor_promises_);
   visitor->Trace(request_hit_test_source_promises_);
   visitor->Trace(reference_spaces_);

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

@@ -44,7 +44,6 @@ class XRDOMOverlayState;
 class XRHitTestOptionsInit;
 class XRHitTestSource;
 class XRPlane;
-class XRRay;
 class XRReferenceSpace;
 class XRRenderState;
 class XRRenderStateInit;
@@ -148,11 +147,6 @@ class XRSession final
       XRTransientInputHitTestOptionsInit* options_init,
       ExceptionState& exception_state);
 
-  ScriptPromise requestHitTest(ScriptState* script_state,
-                               XRRay* ray,
-                               XRSpace* space,
-                               ExceptionState&);
-
   // Called by JavaScript to manually end the session.
   ScriptPromise end(ScriptState* script_state, ExceptionState&);
 
@@ -327,10 +321,6 @@ class XRSession final
 
   void UpdateVisibilityState();
 
-  void OnHitTestResults(
-      ScriptPromiseResolver* resolver,
-      base::Optional<Vector<device::mojom::blink::XRHitResultPtr>> results);
-
   void OnSubscribeToHitTestResult(
       ScriptPromiseResolver* resolver,
       device::mojom::SubscribeToHitTestResult result,
@@ -408,7 +398,6 @@ class XRSession final
   Member<Element> overlay_element_;
   Member<XRDOMOverlayState> dom_overlay_state_;
   bool environment_error_handler_subscribed_ = false;
-  HeapHashSet<Member<ScriptPromiseResolver>> hit_test_promises_;
   // Set of promises returned from CreateAnchor that are still in-flight.
   HeapHashSet<Member<ScriptPromiseResolver>> create_anchor_promises_;
   // Set of promises returned from requestHitTestSource and

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

@@ -48,9 +48,6 @@ enum XRVisibilityState {
   long requestAnimationFrame(XRFrameRequestCallback callback);
   void cancelAnimationFrame(long handle);
 
-  [RuntimeEnabled=WebXRIncubations, CallWith=ScriptState, RaisesException]
-  Promise<FrozenArray<XRHitResult>> requestHitTest(XRRay ray, XRSpace space);
-
   // https://github.com/immersive-web/real-world-geometry/blob/master/plane-detection-explainer.md
   [RuntimeEnabled=WebXRIncubations] readonly attribute XRWorldTrackingState worldTrackingState;
   [RuntimeEnabled=WebXRIncubations, RaisesException] void updateWorldTrackingState(optional XRWorldTrackingStateInit state = {});

third_party/blink/web_tests/external/wpt/resources/chromium/webxr-test.js

@@ -639,7 +639,7 @@ class MockRuntime {
     if (!this.supportedModes_.includes(device.mojom.XRSessionMode.kImmersiveAr)) {
       // Reject outside of AR.
       return Promise.resolve({
-        result : device.mojom.SubscribeToHitTestResult.FAILED,
+        result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
         subscriptionId : 0
       });
     }
@@ -648,7 +648,7 @@ class MockRuntime {
       if (!this.input_sources_.has(nativeOriginInformation.inputSourceId)) {
         // Reject - unknown input source ID.
         return Promise.resolve({
-          result : device.mojom.SubscribeToHitTestResult.FAILED,
+          result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
           subscriptionId : 0
         });
       }
@@ -657,14 +657,14 @@ class MockRuntime {
       if (nativeOriginInformation.referenceSpaceCategory == device.mojom.XRReferenceSpaceCategory.UNBOUNDED
        || nativeOriginInformation.referenceSpaceCategory == device.mojom.XRReferenceSpaceCategory.BOUNDED_FLOOR) {
         return Promise.resolve({
-          result : device.mojom.SubscribeToHitTestResult.FAILED,
+          result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
           subscriptionId : 0
         });
       }
     } else {
       // Planes and anchors are not yet supported by the mock interface.
       return Promise.resolve({
-        result : device.mojom.SubscribeToHitTestResult.FAILED,
+        result : device.mojom.SubscribeToHitTestResult.FAILURE_GENERIC,
         subscriptionId : 0
       });
     }

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -11198,10 +11198,6 @@ interface XRFrame
     method getHitTestResultsForTransientInput
     method getPose
     method getViewerPose
-interface XRHitResult
-    attribute @@toStringTag
-    getter hitMatrix
-    method constructor
 interface XRHitTestResult
     attribute @@toStringTag
     method constructor
@@ -11334,7 +11330,6 @@ interface XRSession : EventTarget
     method constructor
     method end
     method requestAnimationFrame
-    method requestHitTest
     method requestHitTestSource
     method requestHitTestSourceForTransientInput
     method requestReferenceSpace

third_party/blink/web_tests/wpt_internal/webxr/ar/ar_hittest.https.html

-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>let additionalChromiumResources = ["../resources/xr-internal-device-mocking.js"];</script>
-<script src="/webxr/resources/webxr_util.js"></script>
-<script src="/webxr/resources/webxr_test_constants.js"></script>
-<script src="/webxr/resources/webxr_test_asserts.js"></script>
-<canvas />
-
-<script>
-// Because AR is not yet in the core webxr spec, this is an internal-chrome only test.
-let testName = "Ensures hit-test returns expected mock results";
-
-let fakeDeviceInitParams = { supportedModes: ["immersive-ar"],
-                             views: VALID_VIEWS,
-                             supportsEnvironmentIntegration: true,
-                             supportedFeatures: ALL_FEATURES };
-
-let expectedHitMatrix = [1, 0, 0, 1,
-                         0, 1, 0, 2,
-                         0, 0, 1, 3,
-                         0, 0, 0, 1];
-
-let testFunction = function(session, fakeDeviceController, t) {
-  assert_equals(session.mode, 'immersive-ar');
-  assert_not_equals(session.environmentBlendMode, 'opaque');
-  return session.requestReferenceSpace('local').then((referenceSpace) => {
-    let ray = new XRRay({x : 0.0, y : 0.0, z : 0.0}, {x : 1.0, y : 0.0, z: 0.0});
-
-    let hit = new device.mojom.XRHitResult();
-    hit.hitMatrix = new gfx.mojom.Transform();
-    hit.hitMatrix.matrix = expectedHitMatrix;
-
-    fakeDeviceController.setHitTestResults({ results: [hit] });
-
-    return session.requestHitTest(ray, referenceSpace).then(
-        (hitResults) => {
-          t.step(() => {
-            // Test that hit results are what we expected.
-            assert_equals(hitResults.length, 1);
-            assert_equals(hitResults[0].hitMatrix.length, 16);
-            assert_matrix_approx_equals(
-              hitResults[0].hitMatrix,
-              expectedHitMatrix,
-              FLOAT_EPSILON,
-              "Hit test matrix does not equals input test matrix");
-          });
-        });
-    });
-};
-
-xr_session_promise_test(
-  testName, testFunction, fakeDeviceInitParams, 'immersive-ar');
-
-</script>

third_party/blink/web_tests/wpt_internal/webxr/resources/xr-internal-device-mocking.js

@@ -3,25 +3,8 @@
 /* This file contains extensions to the base mocking from the WebPlatform tests
  * for interal tests. The main mocked objects are found in
  * ../external/wpt/resources/chromium/webxr-test.js. */
-MockRuntime.prototype.setHitTestResults = function(results) {
-  this.hittest_results_ = results;
-};
-
 
 // XREnvironmentIntegrationProvider implementation
-
-MockRuntime.prototype.requestHitTest = function(ray) {
-  let hit_results = this.hittest_results_;
-  if (!hit_results) {
-    const hit = new device.mojom.XRHitResult();
-
-    // No change to the underlying matrix/leaving it null results in identity.
-    hit.hitMatrix = new gfx.mojom.Transform();
-    hit_results = {results: [hit]};
-  }
-  return Promise.resolve(hit_results);
-};
-
 MockRuntime.prototype.getSubmitFrameCount = function() {
   return this.presentation_provider_.submit_frame_count_;
 };

third_party/blink/web_tests/wpt_internal/webxr/xrSession_environmentProviderDisconnect.https.html

@@ -9,32 +9,30 @@
 <script>
 // This test manipulates mojo directly to simulate some behavior, and as such is
 // chromium specific.
-let testName = "Outstanding promises get rejected if environmentProvider disconencts";
+const testName = "Outstanding promises get rejected if environmentProvider disconnects";
 
-let fakeDeviceInitParams = { supportedModes: ["immersive-ar"],
+const fakeDeviceInitParams = { supportedModes: ["immersive-ar"],
                              views: VALID_VIEWS,
                              supportsEnvironmentIntegration: true,
                              supportedFeatures: ALL_FEATURES };
 
 let refSpace = undefined;
 
-let ray = new XRRay({x : 0.0, y : 0.0, z : 0.0}, {x : 1.0, y : 0.0, z: 0.0});
-
-let testFunction = function(session, fakeDeviceController, t) {
-  // Override the xr-internal-device-mock for requestHitTest so that we can
+const testFunction = function(session, fakeDeviceController, t) {
+  // Override some promise-based method from mock runtime so that we can
   // also return a promise that never resolves or rejects.
   // This is so that we can simulate a disconnect while the mojo call is still
   // outstanding.
-  let immediatelyResolveHitTest = true;
-  MockRuntime.prototype.requestHitTest = function(Ray) {
-    if (immediatelyResolveHitTest) {
-      var hit = new device.mojom.XRHitResult();
-      hit.hitMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
-      hit_results = {results: [hit]};
-      return Promise.resolve(hit_results);
+  let immediatelyResolvePromise = true;
+  MockRuntime.prototype.subscribeToHitTest = function(nativeOriginInformation, entityTypes, ray) {
+    if (!immediatelyResolvePromise) {
+      return new Promise((resolve,reject) => { });
     }
 
-    return new Promise((resolve,reject) => { });
+    return Promise.resolve({
+      result : device.mojom.SubscribeToHitTestResult.SUCCESS,
+      subscriptionId : 1001
+    });
   }
 
   return session.requestReferenceSpace('local')
@@ -43,16 +41,16 @@ let testFunction = function(session, fakeDeviceController, t) {
 
       // Request a first hit test to ensure that all of the mojo connections are
       // up and running.
-      return session.requestHitTest(ray, refSpace);
+      return session.requestHitTestSource({"space" :refSpace});
     })
     .then(() => {
       immediatelyResolveHitTest = false;
-      let hitTestPromise = session.requestHitTest(ray, refSpace);
+      const hitTestSourcePromise = session.requestHitTestSource({"space" :refSpace})
       fakeDeviceController.closeEnvironmentIntegrationProvider();
-      return hitTestPromise;
+      return hitTestSourcePromise;
     })
     .then(() => {
-        assert_unreached("HitTestPromise should not resolve");
+        assert_unreached("Promise should not resolve");
       },
       (err) => {
         assert_equals(err.name, "InvalidStateError");
@@ -60,6 +58,6 @@ let testFunction = function(session, fakeDeviceController, t) {
 };
 
 xr_session_promise_test(
-  testName, testFunction, fakeDeviceInitParams, 'immersive-ar');
+  testName, testFunction, fakeDeviceInitParams, 'immersive-ar', {requiredFeatures: ["hit-test"]});
 
 </script>