Remove WebVR support from Windows Mixed Reality runtime

This removes WMR's support for WebVR, and refactors some helpers that
existed to simplify those code paths.

Also fixes a few lint errors for these files.

Fixed: 1017847
Change-Id: I95d60fe4892f37febbda0a383e2bf270441f2845
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879661Reviewed-by: Jacob DeWitt <jacde@chromium.org>
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709692}

device/vr/windows_mixed_reality/mixed_reality_device.cc

@@ -70,11 +70,6 @@ MixedRealityDevice::~MixedRealityDevice() {
   Shutdown();
 }
 
-mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
-MixedRealityDevice::BindGamepadFactory() {
-  return gamepad_provider_factory_receiver_.BindNewPipeAndPassRemote();
-}
-
 mojo::PendingRemote<mojom::XRCompositorHost>
 MixedRealityDevice::BindCompositorHost() {
   return compositor_host_receiver_.BindNewPipeAndPassRemote();
@@ -103,13 +98,6 @@ void MixedRealityDevice::RequestSession(
       return;
     }
 
-    if (provider_receiver_) {
-      render_loop_->task_runner()->PostTask(
-          FROM_HERE, base::BindOnce(&XRCompositorCommon::RequestGamepadProvider,
-                                    base::Unretained(render_loop_.get()),
-                                    std::move(provider_receiver_)));
-    }
-
     if (overlay_receiver_) {
       render_loop_->task_runner()->PostTask(
           FROM_HERE, base::BindOnce(&XRCompositorCommon::RequestOverlay,
@@ -176,20 +164,6 @@ void MixedRealityDevice::OnRequestSessionResult(
       base::Unretained(this)));
 }
 
-void MixedRealityDevice::GetIsolatedXRGamepadProvider(
-    mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver) {
-  if (!render_loop_)
-    CreateRenderLoop();
-  if (render_loop_->IsRunning()) {
-    render_loop_->task_runner()->PostTask(
-        FROM_HERE, base::BindOnce(&XRCompositorCommon::RequestGamepadProvider,
-                                  base::Unretained(render_loop_.get()),
-                                  std::move(provider_receiver)));
-  } else {
-    provider_receiver_ = std::move(provider_receiver);
-  }
-}
-
 void MixedRealityDevice::CreateImmersiveOverlay(
     mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver) {
   if (!render_loop_)
@@ -211,15 +185,12 @@ void MixedRealityDevice::SetFrameDataRestricted(bool restricted) {
 }
 
 void MixedRealityDevice::OnPresentingControllerMojoConnectionError() {
-  if (!render_loop_)
-    CreateRenderLoop();
+  if (render_loop_) {
     render_loop_->task_runner()->PostTask(
         FROM_HERE, base::BindOnce(&XRCompositorCommon::ExitPresent,
                                   base::Unretained(render_loop_.get())));
-  // Don't stop the render loop here. We need to keep the gamepad provider alive
-  // so that we don't lose a pending mojo gamepad_callback_.
-  // TODO(https://crbug.com/875187): Alternatively, we could recreate the
-  // provider on the next session, or look into why the callback gets lost.
+  }
+
   OnExitPresent();
   exclusive_controller_receiver_.reset();
 }

device/vr/windows_mixed_reality/mixed_reality_device.h

@@ -22,14 +22,11 @@ namespace device {
 class DEVICE_VR_EXPORT MixedRealityDevice
     : public VRDeviceBase,
       public mojom::XRSessionController,
-      public mojom::IsolatedXRGamepadProviderFactory,
       public mojom::XRCompositorHost {
  public:
   MixedRealityDevice();
   ~MixedRealityDevice() override;
 
-  mojo::PendingRemote<mojom::IsolatedXRGamepadProviderFactory>
-  BindGamepadFactory();
   mojo::PendingRemote<mojom::XRCompositorHost> BindCompositorHost();
 
  private:
@@ -41,11 +38,6 @@ class DEVICE_VR_EXPORT MixedRealityDevice
   // XRSessionController
   void SetFrameDataRestricted(bool restricted) override;
 
-  // mojom::IsolatedXRGamepadProviderFactory
-  void GetIsolatedXRGamepadProvider(
-      mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver)
-      override;
-
   // XRCompositorHost
   void CreateImmersiveOverlay(
       mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver) override;
@@ -60,10 +52,6 @@ class DEVICE_VR_EXPORT MixedRealityDevice
 
   std::unique_ptr<XRCompositorCommon> render_loop_;
 
-  mojo::Receiver<mojom::IsolatedXRGamepadProviderFactory>
-      gamepad_provider_factory_receiver_{this};
-  mojo::PendingReceiver<mojom::IsolatedXRGamepadProvider> provider_receiver_;
-
   mojo::Receiver<mojom::XRCompositorHost> compositor_host_receiver_{this};
   mojo::PendingReceiver<mojom::ImmersiveOverlay> overlay_receiver_;
 

device/vr/windows_mixed_reality/mixed_reality_input_helper.h

@@ -13,31 +13,10 @@
 #include <vector>
 
 #include "base/callback_list.h"
-#include "device/gamepad/public/cpp/gamepads.h"
-#include "device/vr/public/mojom/isolated_xr_service.mojom.h"
 #include "device/vr/public/mojom/vr_service.mojom.h"
-#include "device/vr/util/gamepad_builder.h"
 
 namespace device {
 
-enum class ButtonName {
-  kSelect,
-  kGrip,
-  kTouchpad,
-  kThumbstick,
-};
-
-struct ParsedInputState {
-  mojom::XRInputSourceStatePtr source_state;
-  std::unordered_map<ButtonName, GamepadBuilder::ButtonData> button_data;
-  GamepadPose gamepad_pose;
-  uint16_t vendor_id = 0;
-  uint16_t product_id = 0;
-  ParsedInputState();
-  ~ParsedInputState();
-  ParsedInputState(ParsedInputState&& other);
-};
-
 class WMRCoordinateSystem;
 class WMRInputManager;
 class WMRInputSourceState;
@@ -56,15 +35,13 @@ class MixedRealityInputHelper {
       const WMRCoordinateSystem* origin,
       const WMRTimestamp* timestamp);
 
-  mojom::XRGamepadDataPtr GetWebVRGamepadData(const WMRCoordinateSystem* origin,
-                                              const WMRTimestamp* timestamp);
-
   void Dispose();
 
  private:
   bool EnsureSpatialInteractionManager();
 
-  ParsedInputState ParseWindowsSourceState(const WMRInputSourceState* state,
+  mojom::XRInputSourceStatePtr ParseWindowsSourceState(
+      const WMRInputSourceState* state,
       const WMRCoordinateSystem* origin);
 
   // These event subscriptions can come back on a different thread, while

device/vr/windows_mixed_reality/mixed_reality_renderloop.cc

@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <limits>
 #include <utility>
-#include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -52,7 +51,7 @@ using Microsoft::WRL::ComPtr;
 
 class MixedRealityWindow : public gfx::WindowImpl {
  public:
-  MixedRealityWindow(base::OnceCallback<void()> on_destroyed)
+  explicit MixedRealityWindow(base::OnceCallback<void()> on_destroyed)
       : gfx::WindowImpl(), on_destroyed_(std::move(on_destroyed)) {
     set_window_style(WS_OVERLAPPED);
   }
@@ -89,8 +88,7 @@ gfx::Transform ConvertToGfxTransform(const Matrix4x4& matrix) {
       matrix.M11, matrix.M21, matrix.M31, matrix.M41,
       matrix.M12, matrix.M22, matrix.M32, matrix.M42,
       matrix.M13, matrix.M23, matrix.M33, matrix.M43,
-      matrix.M14, matrix.M24, matrix.M34, matrix.M44
-    );
+      matrix.M14, matrix.M24, matrix.M34, matrix.M44);
   // clang-format on
 }
 
@@ -504,21 +502,6 @@ void MixedRealityRenderLoop::StartPresenting() {
   ShowWindow(window_->hwnd(), SW_SHOW);
 }
 
-mojom::XRGamepadDataPtr MixedRealityRenderLoop::GetNextGamepadData() {
-  if (!timestamp_) {
-    WMRLogging::TraceError(WMRErrorLocation::kGamepadMissingTimestamp);
-    return nullptr;
-  }
-
-  if (!anchor_origin_) {
-    WMRLogging::TraceError(WMRErrorLocation::kGamepadMissingOrigin);
-    return nullptr;
-  }
-
-  return input_helper_->GetWebVRGamepadData(anchor_origin_.get(),
-                                            timestamp_.get());
-}
-
 struct EyeToWorldDecomposed {
   gfx::Quaternion world_to_eye_rotation;
   gfx::Point3F eye_in_world_space;

device/vr/windows_mixed_reality/mixed_reality_renderloop.h

@@ -6,6 +6,7 @@
 #define DEVICE_VR_WINDOWS_MIXED_REALITY_MIXED_REALITY_RENDERLOOP_H_
 
 #include <memory>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
@@ -57,7 +58,6 @@ class MixedRealityRenderLoop : public XRCompositorCommon {
 
   // XRDeviceAbstraction:
   mojom::XRFrameDataPtr GetNextFrameData() override;
-  mojom::XRGamepadDataPtr GetNextGamepadData() override;
   bool PreComposite() override;
   bool SubmitCompositedFrame() override;