Revert "Update emulated position on each XRFrame"

This reverts commit 8be89ae0.

Reason for revert: Build failure:

https://ci.chromium.org/p/chromium/builders/ci/Win%20x64%20Builder/79827
[4142/15096] CXX obj/device/vr/vr/openxr_controller.obj
FAILED: obj/device/vr/vr/openxr_controller.obj
C:\b\s\w\ir\cache\goma\client\gomacc.exe ..\..\third_party\llvm-build\Release+Asserts\bin\clang-cl.e...(too long)
../../device/vr/openxr/openxr_controller.cc(204,19): error: no member named 'emulated_position' in 'device::mojom::XRInputSourceDescription'
description_->emulated_position = false;
~~~~~~~~~~~~  ^
1 error generated.

Original change's description:
> Update emulated position on each XRFrame
> 
> For both the head poses and input poses, send this value through mojo
> from the device process to the renderer process on every frame.
> 
> Bug: 969131
> Change-Id: Ie895deb75bddb6dd883d09828cfcb30f335d3793
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825478
> Auto-Submit: Jacob DeWitt <jacde@chromium.org>
> Commit-Queue: Will Harris <wfh@chromium.org>
> Reviewed-by: Will Harris <wfh@chromium.org>
> Reviewed-by: Klaus Weidner <klausw@chromium.org>
> Reviewed-by: Alexander Cooper <alcooper@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#701389}

TBR=dcheng@chromium.org,wfh@chromium.org,klausw@chromium.org,jacde@chromium.org,alcooper@chromium.org

Change-Id: I91ec66842b8f0a14bcb85145843fb4d617847066
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 969131
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1833005Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701401}

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

@@ -707,7 +707,7 @@ mojom::XRInputSourceStatePtr ArCoreGl::GetInputSourceState() {
   state->description->target_ray_mode = device::mojom::XRTargetRayMode::TAPPING;
 
   // Controller doesn't have a measured position.
-  state->emulated_position = true;
+  state->description->emulated_position = true;
 
   // The Renderer code ignores state->grip for TAPPING (screen-based) target ray
   // mode, so we don't bother filling it in here. If this does get used at

chrome/browser/android/vr/cardboard_input_delegate.cc

@@ -63,7 +63,7 @@ CardboardInputDelegate::GetInputSourceState() {
 
   // It's a gaze-cursor-based device.
   state->description->target_ray_mode = device::mojom::XRTargetRayMode::GAZING;
-  state->emulated_position = true;
+  state->description->emulated_position = true;
 
   // No implicit handedness
   state->description->handedness = device::mojom::XRHandedness::NONE;

chrome/browser/android/vr/gvr_input_delegate.cc

@@ -158,7 +158,7 @@ device::mojom::XRInputSourceStatePtr GvrInputDelegate::GetInputSourceState() {
       device::mojom::XRTargetRayMode::POINTING;
 
   // Controller uses an arm model.
-  state->emulated_position = true;
+  state->description->emulated_position = true;
 
   if (controller_->IsConnected()) {
     // Set the primary button state.

chrome/browser/vr/input_delegate_for_testing.cc

@@ -165,7 +165,7 @@ InputDelegateForTesting::GetInputSourceState() {
   state->source_id = 1;
   state->description->target_ray_mode =
       device::mojom::XRTargetRayMode::POINTING;
-  state->emulated_position = true;
+  state->description->emulated_position = true;
 
   return state;
 }

device/vr/oculus/oculus_render_loop.cc

@@ -347,8 +347,8 @@ device::mojom::XRInputSourceStatePtr OculusRenderLoop::GetTouchData(
       break;
   }
 
-  // Touch controllers are fully 6DoF.
-  state->emulated_position = false;
+  // Touch controller are fully 6DoF.
+  desc->emulated_position = false;
 
   // The grip pose will be rotated and translated back a bit from the pointer
   // pose, which is what the Oculus API returns.

device/vr/openvr/openvr_render_loop.cc

@@ -290,9 +290,6 @@ std::vector<mojom::XRInputSourceStatePtr> OpenVRRenderLoop::GetInputState(
                                                   controller_state, handedness);
     state->gamepad = input_source_data.gamepad;
 
-    // OpenVR controller are fully 6DoF.
-    state->emulated_position = false;
-
     // Re-send the controller's description if it's newly active or if the
     // handedness or profile strings have changed.
     if (newly_active ||
@@ -307,6 +304,9 @@ std::vector<mojom::XRInputSourceStatePtr> OpenVRRenderLoop::GetInputState(
       desc->handedness = handedness;
       input_active_state.controller_role = controller_role;
 
+      // OpenVR controller are fully 6DoF.
+      desc->emulated_position = false;
+
       // Tweak the pointer transform so that it's angled down from the
       // grip. This should be a bit more ergonomic.
       desc->pointer_offset = gfx::Transform();

device/vr/public/mojom/vr_service.mojom

@@ -115,6 +115,7 @@ struct XRPresentationConnection {
 struct XRInputSourceDescription {
   XRTargetRayMode target_ray_mode;
   XRHandedness handedness;
+  bool emulated_position;
 
   // Transform from the grip matrix to the pointer's origin and orientation.
   gfx.mojom.Transform? pointer_offset;
@@ -136,10 +137,6 @@ struct XRInputSourceState {
   // Transform to the controllers grip (users palm) from start space origin.
   gfx.mojom.Transform? grip;
 
-  // True when position is estimated by something like a neck or arm model.
-  // False when position is based on sensors tracking a 6DoF pose.
-  bool emulated_position;
-
   // Describes the current state of the primary input.
   bool primary_input_pressed;
 
@@ -177,10 +174,6 @@ struct VRPose {
   gfx.mojom.Quaternion? orientation;
   gfx.mojom.Point3F? position;
 
-  // True when position is estimated by something like a neck or arm model.
-  // False when position is based on sensors tracking a 6DoF pose.
-  bool emulated_position;
-
   // Velocity/Acceleration is in global coordinates, as rad/s.
   gfx.mojom.Vector3dF? angular_velocity;
   gfx.mojom.Vector3dF? linear_velocity;

device/vr/windows_mixed_reality/mixed_reality_input_helper.cc

@@ -553,7 +553,7 @@ ParsedInputState MixedRealityInputHelper::ParseWindowsSourceState(
       device::mojom::XRInputSourceDescription::New();
 
   // If we've gotten this far we've gotten the real position.
-  source_state->emulated_position = false;
+  description->emulated_position = false;
   description->pointer_offset = grip_from_pointer;
 
   if (is_voice) {

device/vr/windows_mixed_reality/mixed_reality_renderloop.cc

@@ -833,6 +833,8 @@ mojom::XRFrameDataPtr MixedRealityRenderLoop::GetNextFrameData() {
   if (anchor_origin_ &&
       pose_->TryGetViewTransform(anchor_origin_.get(), &view)) {
     got_view = true;
+    // TODO(http://crbug.com/931393): Send down emulated_position_, and report
+    // reset events when this changes.
     emulated_position_ = false;
     ABI::Windows::Foundation::Numerics::Matrix4x4 origin_from_attached;
     if (attached_coordinates->TryGetTransformTo(anchor_origin_.get(),
@@ -908,8 +910,6 @@ mojom::XRFrameDataPtr MixedRealityRenderLoop::GetNextFrameData() {
   ret->pose->input_state =
       input_helper_->GetInputState(anchor_origin_.get(), timestamp_.get());
 
-  ret->pose->emulated_position = emulated_position_;
-
   if (emulated_position_ && last_origin_from_attached_) {
     gfx::DecomposedTransform attached_from_view_decomp;
     attached_from_view_decomp.quaternion = (*ret->pose->orientation);

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

@@ -119,10 +119,8 @@ XRPose* XRFrame::getPose(XRSpace* space_A,
   return space_A->getPose(space_B, mojo_from_viewer_.get());
 }
 
-void XRFrame::SetMojoFromViewer(const TransformationMatrix& mojo_from_viewer,
-                                bool emulated_position) {
+void XRFrame::SetMojoFromViewer(const TransformationMatrix& mojo_from_viewer) {
   mojo_from_viewer_ = std::make_unique<TransformationMatrix>(mojo_from_viewer);
-  emulated_position_ = emulated_position;
 }
 
 void XRFrame::Deactivate() {

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

@@ -41,7 +41,7 @@ class XRFrame final : public ScriptWrappable {
   XRWorldInformation* worldInformation() const { return world_information_; }
   XRAnchorSet* trackedAnchors() const;
 
-  void SetMojoFromViewer(const TransformationMatrix&, bool emulated_position);
+  void SetMojoFromViewer(const TransformationMatrix&);
 
   void Trace(blink::Visitor*) override;
 
@@ -55,8 +55,6 @@ class XRFrame final : public ScriptWrappable {
       XRHitTestSource* hitTestSource,
       XRSpace* relativeTo);
 
-  bool EmulatedPosition() const { return emulated_position_; }
-
  private:
   std::unique_ptr<TransformationMatrix> GetAdjustedPoseMatrix(XRSpace*) const;
   XRPose* GetTargetRayPose(XRInputSource*, XRSpace*) const;
@@ -78,8 +76,6 @@ class XRFrame final : public ScriptWrappable {
   // animation frames. getViewerPose should only be called from JS on active
   // animation frames.
   bool is_animation_frame_ = false;
-
-  bool emulated_position_ = false;
 };
 
 }  // namespace blink

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

@@ -254,10 +254,6 @@ void XRFrameProvider::OnImmersiveFrameData(
   frame_id_ = data->frame_id;
   buffer_mailbox_holder_ = data->buffer_holder;
 
-  if (frame_pose_) {
-    emulated_position_ = frame_pose_->emulated_position;
-  }
-
   pending_immersive_vsync_ = false;
 
   // Post a task to handle scheduled animations after the current
@@ -340,8 +336,7 @@ void XRFrameProvider::ProcessScheduledFrame(
     // presentation frame as newly created presentation frame will get passed to
     // the input source select[/start/end] events.
     immersive_session_->UpdatePresentationFrameState(
-        high_res_now_ms, getPoseMatrix(frame_pose_), frame_data,
-        emulated_position_);
+        high_res_now_ms, getPoseMatrix(frame_pose_), frame_data);
 
     if (frame_pose_) {
       base::span<const device::mojom::blink::XRInputSourceStatePtr>
@@ -406,9 +401,8 @@ void XRFrameProvider::ProcessScheduledFrame(
       // Prior to updating input source state, update the state needed to create
       // presentation frame as newly created presentation frame will get passed
       // to the input source select[/start/end] events.
-      session->UpdatePresentationFrameState(high_res_now_ms,
-                                            getPoseMatrix(frame_pose_),
-                                            frame_data, emulated_position_);
+      session->UpdatePresentationFrameState(
+          high_res_now_ms, getPoseMatrix(frame_pose_), frame_data);
 
       if (frame_pose_) {
         base::span<const device::mojom::blink::XRInputSourceStatePtr>

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

@@ -85,8 +85,6 @@ class XRFrameProvider final : public GarbageCollected<XRFrameProvider> {
 
   base::Optional<gpu::MailboxHolder> buffer_mailbox_holder_;
   bool last_has_focus_ = false;
-
-  bool emulated_position_ = false;
 };
 
 }  // namespace blink

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

@@ -79,6 +79,7 @@ XRInputSource* XRInputSource::CreateOrUpdateFrom(
 
     updated_source->state_.target_ray_mode = desc->target_ray_mode;
     updated_source->state_.handedness = desc->handedness;
+    updated_source->state_.emulated_position = desc->emulated_position;
 
     updated_source->input_from_pointer_ =
         TryGetTransformationMatrix(desc->pointer_offset);
@@ -91,8 +92,6 @@ XRInputSource* XRInputSource::CreateOrUpdateFrom(
 
   updated_source->mojo_from_input_ = TryGetTransformationMatrix(state->grip);
 
-  updated_source->state_.emulated_position = state->emulated_position;
-
   return updated_source;
 }
 

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

@@ -924,8 +924,7 @@ void XRSession::ApplyPendingRenderState() {
 void XRSession::UpdatePresentationFrameState(
     double timestamp,
     std::unique_ptr<TransformationMatrix> mojo_from_viewer,
-    const device::mojom::blink::XRFrameDataPtr& frame_data,
-    bool emulated_position) {
+    const device::mojom::blink::XRFrameDataPtr& frame_data) {
   TRACE_EVENT0("gpu", __FUNCTION__);
   DVLOG(2) << __FUNCTION__ << " : frame_data valid? "
            << (frame_data ? true : false);
@@ -937,8 +936,6 @@ void XRSession::UpdatePresentationFrameState(
   DVLOG(2) << __FUNCTION__ << " : mojo_from_viewer_ valid? "
            << (mojo_from_viewer_ ? true : false);
 
-  emulated_position_ = emulated_position;
-
   // Update objects that might change on per-frame basis.
   if (frame_data) {
     world_information_->ProcessPlaneInformation(
@@ -1052,9 +1049,7 @@ XRFrame* XRSession::CreatePresentationFrame() {
   if (mojo_from_viewer_ && visibility_state_ != XRVisibilityState::HIDDEN) {
     DVLOG(2) << __func__ << " : mojo_from_viewer_ is set and not hidden,"
              << " updating presentation frame";
-
-    presentation_frame->SetMojoFromViewer(*mojo_from_viewer_,
-                                          EmulatedPosition());
+    presentation_frame->SetMojoFromViewer(*mojo_from_viewer_);
   }
   return presentation_frame;
 }

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

@@ -187,14 +187,15 @@ class XRSession final
   device::mojom::blink::XRInputSourceButtonListenerAssociatedPtrInfo
   GetInputClickListener();
 
+  // TODO(crbug.com/969131): Update the mojom to deliver this per-frame.
   bool EmulatedPosition() const {
-    // If we don't have display info then we should be using the identity
-    // reference space, which by definition will be emulating the position.
-    if (!display_info_) {
-      return true;
+    if (display_info_) {
+      return !display_info_->capabilities->has_position;
     }
 
-    return emulated_position_;
+    // If we don't have display info then we should be using the identity
+    // reference space, which by definition will be emulating the position.
+    return true;
   }
 
   // Immersive sessions currently use two views for VR, and only a single view
@@ -235,8 +236,7 @@ class XRSession final
   void UpdatePresentationFrameState(
       double timestamp,
       std::unique_ptr<TransformationMatrix> mojo_from_viewer,
-      const device::mojom::blink::XRFrameDataPtr& frame_data,
-      bool emulated_position);
+      const device::mojom::blink::XRFrameDataPtr& frame_data);
 
  private:
   class XRSessionResizeObserverDelegate;
@@ -342,8 +342,6 @@ class XRSession final
   bool sensorless_session_ = false;
 
   int16_t last_frame_id_ = -1;
-
-  bool emulated_position_ = false;
 };
 
 }  // namespace blink

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

@@ -268,7 +268,6 @@ class MockRuntime {
     this.pose_ = {
       orientation: { x: q[0], y: q[1], z: q[2], w: q[3] },
       position: { x: p[0], y: p[1], z: p[2] },
-      emulatedPosition: emulatedPosition,
       angularVelocity: null,
       linearVelocity: null,
       angularAcceleration: null,
@@ -692,7 +691,6 @@ class MockXRInputSource {
     this.desc_dirty_ = true;
     this.pointer_offset_ = new gfx.mojom.Transform();
     this.pointer_offset_.matrix = getMatrixFromTransform(transform);
-    this.emulated_position_ = emulatedPosition;
   }
 
   disconnect() {
@@ -814,11 +812,11 @@ class MockXRInputSource {
 
     input_state.gamepad = this.gamepad_;
 
-    input_state.emulatedPosition = this.emulated_position_;
-
     if (this.desc_dirty_) {
       let input_desc = new device.mojom.XRInputSourceDescription();
 
+      input_desc.emulatedPosition = this.emulated_position_;
+
       switch (this.target_ray_mode_) {
         case 'gaze':
           input_desc.targetRayMode = device.mojom.XRTargetRayMode.GAZING;

third_party/blink/web_tests/external/wpt/webxr/getViewerPose_emulatedPosition.https.html

-<!DOCTYPE html>
-<body>
-  <script src=/resources/testharness.js></script>
-  <script src=/resources/testharnessreport.js></script>
-  <script src="resources/webxr_util.js"></script>
-  <script src="resources/webxr_test_constants.js"></script>
-  <canvas></canvas>
-
-  <script>
-
-    let testName = "XRFrame getViewerPose has emulatedPosition set properly.";
-
-    const poseTransform = {
-        position: [1, 1, 1],
-        orientation: [0.5, 0.5, 0.5, 0.5]
-    };
-
-    let testFunction = function(session, fakeDeviceController, t) {
-      return session.requestReferenceSpace('local')
-        .then((referenceSpace) => new Promise((resolve, reject) => {
-          function CheckPositionNotEmulated(time, vrFrame){
-            t.step(() => {
-              let pose = vrFrame.getViewerPose(referenceSpace);
-              assert_not_equals(pose, null);
-              assert_equals(pose.emulatedPosition, false);
-              fakeDeviceController.setViewerOrigin(poseTransform, true);
-            });
-
-            session.requestAnimationFrame(CheckPositionEmulated);
-          }
-
-          function CheckPositionEmulated(time, vrFrame) {
-            t.step(() => {
-              let pose = vrFrame.getViewerPose(referenceSpace);
-              assert_not_equals(pose, null);
-              assert_equals(pose.emulatedPosition, true);
-            });
-
-            // Finished.
-            resolve();
-          }
-
-          session.requestAnimationFrame(CheckPositionNotEmulated);
-        }));
-    };
-
-    xr_session_promise_test(testName, testFunction,
-      TRACKED_IMMERSIVE_DEVICE, 'immersive-vr');
-
-  </script>
-</body>

third_party/blink/web_tests/external/wpt/webxr/xrInputSource_emulatedPosition.https.html

-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/webxr_util.js"></script>
-<script src="resources/webxr_test_constants.js"></script>
-<script src="resources/webxr_test_asserts.js"></script>
-<canvas id="webgl-canvas"></canvas>
-
-<script>
-
-let testName = "Poses from XRInputSource.gripSpace have emulatedPosition set "
-  + "properly";
-
-let fakeDeviceInitParams = TRACKED_IMMERSIVE_DEVICE;
-
-let testFunction =
-  (session, fakeDeviceController, t) => new Promise((resolve) => {
-    let input_source = fakeDeviceController.simulateInputSourceConnection({
-      handedness: "right",
-      targetRayMode: "tracked-pointer",
-      pointerOrigin: IDENTITY_TRANSFORM,
-      gripOrigin: VALID_GRIP_TRANSFORM,
-      profiles: []
-    });
-
-    // Must have a reference space to get input poses. eye-level doesn't apply
-    // any transforms to the given matrix.
-    session.requestReferenceSpace('local').then( (referenceSpace) => {
-
-      function CheckPositionNotEmulated(time, xrFrame) {
-        let source = session.inputSources[0];
-        let grip_pose = xrFrame.getPose(source.gripSpace, referenceSpace);
-
-        t.step(() => {
-          assert_not_equals(grip_pose, null);
-          assert_equals(grip_pose.emulatedPosition, false);
-        });
-
-        input_source.setGripOrigin(VALID_GRIP_TRANSFORM, true);
-        session.requestAnimationFrame(CheckPositionEmulated);
-      }
-
-      function CheckPositionEmulated(time, xrFrame) {
-        let source = session.inputSources[0];
-        let grip_pose = xrFrame.getPose(source.gripSpace, referenceSpace);
-
-        t.step(() => {
-          assert_not_equals(grip_pose, null);
-          assert_equals(grip_pose.emulatedPosition, true);
-        });
-
-        resolve();
-      }
-
-      // Can only request input poses in an xr frame.
-      session.requestAnimationFrame(CheckPositionNotEmulated);
-    });
-  });
-
-xr_session_promise_test(
-  testName, testFunction, fakeDeviceInitParams, 'immersive-vr');
-
-</script>