Fix issue with inline WebXR sessions returning null viewports

Introduction of the "none" eye missed inverting the logic for determining which viewport to return in the XRWebGLLayer, which caused it to return the viewport typically associated with the right eye, which is null for inline sessions. Bug: 966077 Change-Id: I6ca51c327f7081ea4180e8515cc076b3ed8c4de8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635731Reviewed-by: Alexander Cooper <alcooper@chromium.org> Reviewed-by: Klaus Weidner <klausw@chromium.org> Commit-Queue: Brandon Jones <bajones@chromium.org> Cr-Commit-Position: refs/heads/master@{#664576}

Fix issue with inline WebXR sessions returning null viewports
Introduction of the "none" eye missed inverting the logic for determining which viewport to return in the XRWebGLLayer, which caused it to return the viewport typically associated with the right eye, which is null for inline sessions. Bug: 966077 Change-Id: I6ca51c327f7081ea4180e8515cc076b3ed8c4de8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635731Reviewed-by: Alexander Cooper <alcooper@chromium.org> Reviewed-by: Klaus Weidner <klausw@chromium.org> Commit-Queue: Brandon Jones <bajones@chromium.org> Cr-Commit-Position: refs/heads/master@{#664576}
fa044597 · Brandon Jones · Commit Bot · 06f43b52 · fa044597 · fa044597
Commit fa044597 authored May 30, 2019 by Brandon Jones Committed by Commit Bot May 30, 2019
2 changed files
--- a/third_party/blink/renderer/modules/xr/xr_webgl_layer.cc
+++ b/third_party/blink/renderer/modules/xr/xr_webgl_layer.cc
@@ -184,10 +184,11 @@ XRViewport* XRWebGLLayer::GetViewportForEye(XRView::XREye eye) {
  if (viewports_dirty_)
    UpdateViewports();

-  if (eye == XRView::kEyeLeft)
-    return left_viewport_;
+  if (eye == XRView::kEyeRight)
+    return right_viewport_;

-  return right_viewport_;
+  // This code path also handles an eye of "none".
+  return left_viewport_;
 }

 double XRWebGLLayer::getNativeFramebufferScaleFactor(XRSession* session) {

--- a/third_party/blink/web_tests/external/wpt/webxr/xrWebGLLayer_viewports.https.html
+++ b/third_party/blink/web_tests/external/wpt/webxr/xrWebGLLayer_viewports.https.html
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-constants.js"></script>
+<script src="resources/webxr_util.js"></script>
+<script src="resources/xr-test-asserts.js"></script>
+<canvas></canvas>
+
+<script>
+
+let immersiveTestName = "XRWebGLLayer reports a valid viewports for immersive sessions";
+let inlineTestName = "XRWebGLLayer reports a valid viewports for inline sessions";
+
+let fakeDeviceInitParams = { supportsImmersive:true };
+
+let testFunction = function(session, fakeDeviceController, t) {
+  // Need to have a valid pose.
+  fakeDeviceController.setXRPresentationFrameData(VALID_POSE_MATRIX, [{
+      eye:"left",
+      projectionMatrix: VALID_PROJECTION_MATRIX,
+      viewMatrix: VALID_VIEW_MATRIX
+    }, {
+      eye:"right",
+      projectionMatrix: VALID_PROJECTION_MATRIX,
+      viewMatrix: VALID_VIEW_MATRIX
+    }]);
+
+  return session.requestReferenceSpace('viewer')
+      .then((space) => new Promise((resolve) => {
+    function onFrame(time, xrFrame) {
+      let viewer_pose = xrFrame.getViewerPose(space);
+
+      let layer = xrFrame.session.renderState.baseLayer;
+      for (view of viewer_pose.views) {
+        let viewport = layer.getViewport(view);
+
+        // Ensure the returned object is an XRViewport object
+        assert_not_equals(viewport, null);
+        assert_true(viewport instanceof XRViewport);
+
+        // Ensure the viewport dimensions are valid
+        assert_greater_than_equal(viewport.x, 0);
+        assert_greater_than_equal(viewport.y, 0);
+        assert_greater_than_equal(viewport.width, 1);
+        assert_greater_than_equal(viewport.height, 1);
+      }
+
+      // Finished test.
+      resolve();
+    }
+
+    session.requestAnimationFrame(onFrame);
+  }));
+};
+
+xr_session_promise_test(immersiveTestName, testFunction,
+  fakeDeviceInitParams, 'immersive-vr');
+xr_session_promise_test(inlineTestName, testFunction,
+  fakeDeviceInitParams, 'inline');
+
+</script>