Update web-platform-tests to revision cfada7e6cb379699fa94c7ed8fcb97082327e10c

This commit is contained in:
WPT Sync Bot 2019-07-31 10:22:21 +00:00
parent 87e7e3d429
commit 06b00da16b
179 changed files with 6103 additions and 1186 deletions

View file

@ -74,6 +74,7 @@ function xr_session_promise_test(
let glLayer = new XRWebGLLayer(session, gl, {
compositionDisabled: session.mode == 'inline'
});
glLayer.context = gl;
// Session must have a baseLayer or frame requests
// will be ignored.
session.updateRenderState({
@ -113,7 +114,6 @@ function forEachWebxrObject(callback) {
callback(window.XRView, 'XRView');
callback(window.XRViewport, 'XRViewport');
callback(window.XRViewerPose, 'XRViewerPose');
callback(window.XRLayer, 'XRLayer');
callback(window.XRWebGLLayer, 'XRWebGLLayer');
callback(window.XRWebGLLayerInit, 'XRWebGLLayerInit');
callback(window.XRCoordinateSystem, 'XRCoordinateSystem');
@ -138,8 +138,8 @@ let loadChromiumResources = Promise.resolve().then(() => {
'/gen/gpu/ipc/common/sync_token.mojom.js',
'/gen/ui/display/mojom/display.mojom.js',
'/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
'/gen/ui/gfx/mojo/gpu_fence_handle.mojom.js',
'/gen/ui/gfx/mojo/transform.mojom.js',
'/gen/ui/gfx/mojom/gpu_fence_handle.mojom.js',
'/gen/ui/gfx/mojom/transform.mojom.js',
'/gen/device/vr/public/mojom/vr_service.mojom.js',
'/resources/chromium/webxr-test.js',
'/resources/testdriver.js',

View file

@ -75,6 +75,8 @@ let testFunction = function(session, fakeDeviceController, t) {
"Expect to get a cached_input_source, iteration: " + inputChangeEvents);
assert_not_equals(cached_input_source.gamepad, null,
"Expect to have a gamepad, iteration: " + inputChangeEvents);
assert_equals(cached_input_source.gamepad.index, -1,
"WebXR Gamepad.index must be -1, iteration: " + inputChangeEvents);
assert_true(cached_input_source.gamepad.connected,
"Expect the gamepad to be connected, iteration: " + inputChangeEvents);
}
@ -84,6 +86,8 @@ let testFunction = function(session, fakeDeviceController, t) {
"Expect to have a cached_input_source, iteration: " + inputChangeEvents);
assert_not_equals(cached_input_source.gamepad, null,
"Expect to have a gamepad on cached_input_source, iteration: " + inputChangeEvents);
assert_equals(cached_input_source.gamepad.index, -1,
"WebXR Gamepad.index must be -1, iteration: " + inputChangeEvents);
assert_false(cached_input_source.gamepad.connected,
"Expect cached gamepad to be disconnected, iteration: " + inputChangeEvents);
}

View file

@ -52,6 +52,7 @@ let testFunction = function(session, fakeDeviceController, t) {
function assertSameObjects() {
assert_equals(session.inputSources[0], cached_input_source);
assert_equals(cached_input_source.gamepad, cached_gamepad);
assert_equals(cached_gamepad.index, -1);
}
// Input events and gamepad state changes (button presses, axis movements)
@ -72,6 +73,7 @@ let testFunction = function(session, fakeDeviceController, t) {
cached_input_source = session.inputSources[0];
cached_gamepad = cached_input_source.gamepad;
t.step(() => {
assert_equals(cached_gamepad.index, -1);
assert_equals(cached_gamepad.buttons.length, 3);
assert_equals(cached_gamepad.axes.length, 2);
// Initially, the button should not be pressed and the axes values should

View file

@ -1,69 +0,0 @@
<!DOCTYPE html>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="resources/webxr_test_constants.js"></script>
<script src="resources/webxr_util.js"></script>
<canvas></canvas>
<script>
let immersiveTestName = "XRWebGLLayer reports a valid framebuffer for immersive sessions";
let inlineTestName = "XRWebGLLayer reports a valid framebuffer for inline sessions";
let fakeDeviceInitParams = TRACKED_IMMERSIVE_DEVICE;
let testFunction = function(session, fakeDeviceController, t) {
return session.requestReferenceSpace('viewer')
.then((space) => new Promise((resolve) => {
function onFrame(time, xrFrame) {
let layer = xrFrame.session.renderState.baseLayer;
let gl = layer.context;
// The layer's framebuffer is a WebGL framebuffer
t.step(() => {
assert_not_equals(layer.framebuffer, null);
assert_true(layer.framebuffer instanceof WebGLFramebuffer);
// The XR framebuffer is not bound to the GL context by default.
assert_not_equals(layer.framebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
});
// The XR framebuffer can be bound to the GL context.
gl.bindFramebuffer(gl.FRAMEBUFFER, layer.framebuffer);
t.step(() => {
assert_equals(layer.framebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
});
// The XR framebuffer has a 2D texture
let attachment = gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE);
t.step(() => {
assert_equals(attachment, gl.TEXTURE);
});
// Check that each viewport fits inside the framebuffer dimensions
let viewer_pose = xrFrame.getViewerPose(space);
for (view of viewer_pose.views) {
let viewport = layer.getViewport(view);
t.step(() => {
assert_less_than_equal(viewport.x + viewport.width, layer.framebufferWidth);
assert_less_than_equal(viewport.y + viewport.height, layer.framebufferHeight);
});
}
// Finished test.
resolve();
}
session.requestAnimationFrame(onFrame);
}));
};
xr_session_promise_test(immersiveTestName, testFunction,
fakeDeviceInitParams, 'immersive-vr');
xr_session_promise_test(inlineTestName, testFunction,
fakeDeviceInitParams, 'inline');
</script>

View file

@ -31,6 +31,10 @@ let testFunction =
}
assert_not_equals(xrFramebuffer, null);
// The XR framebuffer is not bound to the GL context by default.
assert_not_equals(xrFramebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
assert_greater_than(webglLayer.framebufferWidth, 0);
assert_greater_than(webglLayer.framebufferHeight, 0);