Attachment 397842 Details for Bug 211129 – Patch

[patch] Patch

bug-211129-20200428180200.patch (text/plain), 3.75 KB, created by Sergio Villar Senin on 2020-04-28 09:02:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Villar Senin

Created: 2020-04-28 09:02:01 PDT

Size: 3.75 KB

patch

obsolete

>Subversion Revision: 260825
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 1ce56cd46d689d1d04f292c84be21c0820f5155d..332e8a0e35dd2718168112b6a322885cf4ec254c 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,20 @@
>+2020-04-28  Sergio Villar Senin  <svillar@igalia.com>
>+
>+        [WebXR] Import latest changes from webxr/resources in tests
>+        https://bugs.webkit.org/show_bug.cgi?id=211129
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The code in webxr_utils.js had some engine detecting code that was not
>+        working, and thus was unconditionally loading Chromium-only resources when
>+        running tests with other engines (as WebKit). I fixed it upstream in
>+        https://github.com/web-platform-tests/wpt/pull/23200 and now I'm importing it
>+        along with a recent fix in webxr_test_constants.js.
>+
>+        * web-platform-tests/webxr/resources/webxr_test_constants.js: Reverse position.
>+        * web-platform-tests/webxr/resources/webxr_util.js:
>+        (xr_promise_test): Properly detect browser engines.
>+
> 2020-04-26  Alexey Shvayka  <shvaikalesh@gmail.com>
> 
>         InternalFunction::createSubclassStructure should use newTarget's globalObject
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants.js b/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants.js
>index 959859cba2136de61c5e233cd66af9c96776eda5..19ddbc24200de2039ce826507c4a6cea89979b05 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants.js
>+++ b/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_test_constants.js
>@@ -71,7 +71,7 @@ const VALID_FLOOR_ORIGIN_MATRIX = [1, 0,    0,  0,
>                                      1, 1.65, -1, 1];
> 
> const VALID_FLOOR_ORIGIN = {
>-    position: [1.0, 1.65, -1.0],
>+    position: [-1.0, -1.65, 1.0],
>     orientation: [0, 0, 0, 1]
> };
> 
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_util.js b/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_util.js
>index 65c39844b15d5ed7d5d5ba3000245bbcf3bef129..20585ef73797c58b0406d2a23d132e8a919be408 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_util.js
>+++ b/LayoutTests/imported/w3c/web-platform-tests/webxr/resources/webxr_util.js
>@@ -10,19 +10,21 @@
> // Debugging message helper, by default does nothing. Implementations can
> // override this.
> var xr_debug = function(name, msg) {}
>+var isChromiumBased = 'MojoInterfaceInterceptor' in self;
>+var isWebKitBased = 'internals' in self && 'xrTest' in internals;
> 
> function xr_promise_test(name, func, properties) {
>   promise_test(async (t) => {
>     // Perform any required test setup:
>     xr_debug(name, 'setup');
> 
>-    if (window.XRTest === undefined) {
>+    if (isChromiumBased) {
>       // Chrome setup
>       await loadChromiumResources;
>       xr_debug = navigator.xr.test.Debug;
>     }
> 
>-    if (self.internals && internals.xrTest && navigator.xr) {
>+    if (isWebKitBased) {
>       // WebKit setup
>       await setupWebKitWebXRTestAPI;
>     }
>@@ -161,7 +163,7 @@ function forEachWebxrObject(callback) {
> 
> // Code for loading test API in Chromium.
> let loadChromiumResources = Promise.resolve().then(() => {
>-  if (!('MojoInterfaceInterceptor' in self)) {
>+  if (!isChromiumBased) {
>     // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
>     // not present in the global namespace.
>     return;
>@@ -206,7 +208,7 @@ let loadChromiumResources = Promise.resolve().then(() => {
> });
> 
> let setupWebKitWebXRTestAPI = Promise.resolve().then(() => {
>-  if (!self.internals) {
>+  if (!isWebKitBased) {
>     // Do nothing on non-WebKit-based browsers.
>     return;
>   }

Actions: View | Formatted Diff | Diff

Attachments on bug 211129: 397842