WebXR - AR - propagate session options to ArCoreGl

ArCoreGl (roughly corresponding to an immersive-ar session) currently
does not receive requested features list. The list will eventually be
needed to remove the assumption in blink about world space being
equivalent to local space (or sometimes unbounded, see [0]).

[0] https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/renderer/modules/xr/xr_reference_space.cc;l=112

Bug: 953503
Change-Id: I5b7773b83d1c9cdac4de7f8f4635da69d607c91f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2140952Reviewed-by: Klaus Weidner <klausw@chromium.org>
Commit-Queue: Piotr Bialecki <bialpio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781903}

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

@@ -126,6 +126,7 @@ void ArCoreDevice::RequestSession(
 
   DCHECK(!session_state_->pending_request_session_callback_);
   session_state_->pending_request_session_callback_ = std::move(callback);
+  session_state_->enabled_features_ = options->enabled_features;
 
   bool use_dom_overlay = base::Contains(
       options->enabled_features, device::mojom::XRSessionFeature::DOM_OVERLAY);
@@ -335,7 +336,7 @@ void ArCoreDevice::RequestArCoreGlInitialization(
         &ArCoreGl::Initialize,
         session_state_->arcore_gl_thread_->GetArCoreGl()->GetWeakPtr(),
         arcore_session_utils_.get(), arcore_factory_.get(), drawing_widget,
-        frame_size, rotation,
+        frame_size, rotation, session_state_->enabled_features_,
         CreateMainThreadCallback(base::BindOnce(
             &ArCoreDevice::OnArCoreGlInitializationComplete, GetWeakPtr()))));
     return;

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

@@ -129,6 +129,9 @@ class ArCoreDevice : public VRDeviceBase {
     // the callback for replying once that initialization completes. Only one
     // concurrent session is supported, other requests are rejected.
     mojom::XRRuntime::RequestSessionCallback pending_request_session_callback_;
+
+    // List of features that are enabled on the session.
+    std::vector<device::mojom::XRSessionFeature> enabled_features_;
   };
 
   // This object is reset to initial values when ending a session. This helps

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

@@ -124,12 +124,14 @@ ArCoreGl::~ArCoreGl() {
   CloseBindingsIfOpen();
 }
 
-void ArCoreGl::Initialize(vr::ArCoreSessionUtils* session_utils,
-                          ArCoreFactory* arcore_factory,
-                          gfx::AcceleratedWidget drawing_widget,
-                          const gfx::Size& frame_size,
-                          display::Display::Rotation display_rotation,
-                          base::OnceCallback<void(bool)> callback) {
+void ArCoreGl::Initialize(
+    vr::ArCoreSessionUtils* session_utils,
+    ArCoreFactory* arcore_factory,
+    gfx::AcceleratedWidget drawing_widget,
+    const gfx::Size& frame_size,
+    display::Display::Rotation display_rotation,
+    const std::vector<device::mojom::XRSessionFeature>& enabled_features,
+    base::OnceCallback<void(bool)> callback) {
   DVLOG(3) << __func__;
 
   DCHECK(IsOnGlThread());
@@ -138,6 +140,9 @@ void ArCoreGl::Initialize(vr::ArCoreSessionUtils* session_utils,
   transfer_size_ = frame_size;
   camera_image_size_ = frame_size;
   display_rotation_ = display_rotation;
+  // TODO(https://crbug.com/953503): start using the list to control the
+  // behavior & send appropriate data in GetFrameData().
+  enabled_features_ = enabled_features;
   should_update_display_geometry_ = true;
 
   if (!InitializeGl(drawing_widget)) {

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

@@ -67,12 +67,14 @@ class ArCoreGl : public mojom::XRFrameDataProvider,
   explicit ArCoreGl(std::unique_ptr<ArImageTransport> ar_image_transport);
   ~ArCoreGl() override;
 
-  void Initialize(vr::ArCoreSessionUtils* session_utils,
-                  ArCoreFactory* arcore_factory,
-                  gfx::AcceleratedWidget drawing_widget,
-                  const gfx::Size& frame_size,
-                  display::Display::Rotation display_rotation,
-                  base::OnceCallback<void(bool)> callback);
+  void Initialize(
+      vr::ArCoreSessionUtils* session_utils,
+      ArCoreFactory* arcore_factory,
+      gfx::AcceleratedWidget drawing_widget,
+      const gfx::Size& frame_size,
+      display::Display::Rotation display_rotation,
+      const std::vector<device::mojom::XRSessionFeature>& enabled_features,
+      base::OnceCallback<void(bool)> callback);
 
   void CreateSession(mojom::VRDisplayInfoPtr display_info,
                      ArCoreGlCreateSessionCallback create_callback,
@@ -179,6 +181,11 @@ class ArCoreGl : public mojom::XRFrameDataProvider,
   // state on session shutdown. See https://crbug.com/1065572.
   void RunNextGetFrameData();
 
+  // List of features enabled on this session. Required to correctly configure
+  // the session and only send out necessary data related to reference spaces to
+  // blink. Valid after the call to |Initialize()| method.
+  std::vector<device::mojom::XRSessionFeature> enabled_features_;
+
   base::OnceClosure session_shutdown_callback_;
 
   scoped_refptr<gl::GLSurface> surface_;