Add WPT and fix logic for XRWebGlBinding constructor

Construction logic is defined: https://immersive-web.github.io/layers/#dom-xrwebglbinding-xrwebglbinding Change-Id: I01fa10b1d1413a70150134e2423630dc4d0546a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536038 Auto-Submit: Alexander Cooper <alcooper@chromium.org> Commit-Queue: Brandon Jones <bajones@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Cr-Commit-Position: refs/heads/master@{#827279}

Add WPT and fix logic for XRWebGlBinding constructor
Construction logic is defined: https://immersive-web.github.io/layers/#dom-xrwebglbinding-xrwebglbinding Change-Id: I01fa10b1d1413a70150134e2423630dc4d0546a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536038 Auto-Submit: Alexander Cooper <alcooper@chromium.org> Commit-Queue: Brandon Jones <bajones@chromium.org> Reviewed-by: Brandon Jones <bajones@chromium.org> Cr-Commit-Position: refs/heads/master@{#827279}
4a941689 · Alexander Cooper · Commit Bot · f4a2ff7e · 4a941689 · 4a941689
Commit 4a941689 authored Nov 13, 2020 by Alexander Cooper Committed by Commit Bot Nov 13, 2020
2 changed files
--- a/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc
+++ b/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc
@@ -31,6 +31,13 @@ XRWebGLBinding* XRWebGLBinding::Create(XRSession* session,
    return nullptr;
  }
+  if (!session->immersive()) {
+    exception_state.ThrowDOMException(DOMExceptionCode::kInvalidStateError,
+                                      "Cannot create an XRWebGLBinding for an "
+                                      "inline XRSession.");
+    return nullptr;
+  }
  WebGLRenderingContextBase* webgl_context =
      webglRenderingContextBaseFromUnion(context);
@@ -41,7 +48,7 @@ XRWebGLBinding* XRWebGLBinding::Create(XRSession* session,
    return nullptr;
  }
-  if (session->immersive() && !webgl_context->IsXRCompatible()) {
+  if (!webgl_context->IsXRCompatible()) {
    exception_state.ThrowDOMException(
        DOMExceptionCode::kInvalidStateError,
        "WebGL context must be marked as XR compatible in order to "

--- a/third_party/blink/web_tests/external/wpt/webxr/layers/xrWebGLBinding_constructor.https.html
+++ b/third_party/blink/web_tests/external/wpt/webxr/layers/xrWebGLBinding_constructor.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>
+function testConstructor(t, gl) {
+  return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
+    .then(() => {
+      return navigator.xr.requestSession('inline')
+        .then((session) => {
+          try {
+            let webglLayerIncompatible = new XRWebGLBinding(session, gl);
+            assert_unreached("XRWebGLBinding should fail when created with an inline session.");
+          } catch (err) {
+            assert_equals(err.name, "InvalidStateError", "Should get InvalidStateError for creating with inline session.");
+          }
+        });
+    })
+    .then(() => {
+      return new Promise((resolve) => {
+        navigator.xr.test.simulateUserActivation(() => {
+          let xrSession = null;
+          navigator.xr.requestSession('immersive-vr')
+          .then((session) => {
+            xrSession = session;
+            t.step_func(() => {
+              try {
+                let webglLayerIncompatible = new XRWebGLBinding(xrSession, gl);
+                assert_unreached("XRWebGLBinding should fail when created with a context that is not XRCompatible.")
+              } catch (err) {
+                assert_equals(err.name, "InvalidStateError", "Should get InvalidStateError for non-XRCompatible context.");
+              }
+            })
+            return gl.makeXRCompatible();
+          }).then(() => {
+            try {
+              let webglLayerGood = new XRWebGLBinding(xrSession, gl);
+            } catch (err) {
+              reject("XRWebGLBinding should not fail with valid arguments.");
+            }
+            let lose_context_ext = gl.getExtension('WEBGL_lose_context');
+            gl.canvas.addEventListener('webglcontextlost', (ev) => {
+              ev.preventDefault();
+              try {
+                let webglLayerBadContext = new XRWebGLBinding(xrSession, gl);
+                reject("XRWebGLBinding should fail when created with a lost context.");
+              } catch (err) {
+                assert_equals(err.name, 'InvalidStateError', "Should get InvalidStateError for lost context.");
+                t.step_timeout(() => { lose_context_ext.restoreContext(); }, 100);
+              }
+            });
+            gl.canvas.addEventListener('webglcontextrestored', (ev) => {
+              resolve(xrSession.end().then(() => {
+                try {
+                  let webglLayerBadSession = new XRWebGLBinding(xrSession, gl);
+                  assert_unreached("XRWebGLBinding should fail when created with an ended session.");
+                } catch (err) {
+                  assert_equals(err.name, 'InvalidStateError', "Should get InvalidStateError when passed an ended session.");
+                }
+              }));
+            });
+            lose_context_ext.loseContext();
+          });
+        });
+      });
+    });
+}
+xr_promise_test("Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl",
+  testConstructor, null, 'webgl');
+xr_promise_test("Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl2",
+  testConstructor, null, 'webgl2');
+</script>