BASELINE: Update Chromium to 88.0.4324.208

Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 58 insertions, 32 deletions

diff --git a/chromium/third_party/webxr_test_pages/DIR_METADATA b/chromium/third_party/webxr_test_pages/DIR_METADATA
new file mode 100644
index 00000000000..ffb6195e710
--- /dev/null
+++ b/chromium/third_party/webxr_test_pages/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail {
+  component: "Blink>WebXR"
+}
+team_email: "xr-dev@chromium.org"
diff --git a/chromium/third_party/webxr_test_pages/OWNERS b/chromium/third_party/webxr_test_pages/OWNERS
index 8bff58477bb..e01af6d660c 100644
--- a/chromium/third_party/webxr_test_pages/OWNERS
+++ b/chromium/third_party/webxr_test_pages/OWNERS
@@ -2,6 +2,3 @@ alcooper@chromium.org
 bajones@chromium.org
 bialpio@chromium.org
 klausw@chromium.org
-
-# TEAM: xr-dev@chromium.org
-# COMPONENT: Blink>WebXR
diff --git a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/lighting-estimation.html b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/lighting-estimation.html
index be4c2c883ef..e6ebe4f6850 100644
--- a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/lighting-estimation.html
+++ b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/lighting-estimation.html
@@ -51,12 +51,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <details open>
         <summary>Lighting Estimation</summary>
         <p>
-          <b style='color: darkred'>The Light Estimation API is undergoing
-          a redesign. This page will not be functional in newer versions of
-          Chrome until that work is complete.</b>
           This sample demonstrates use of a non-exclusive XRSession to present
           Augmented Reality content.
           <a class="back" href="./index.html">Back</a>
+          <hr/>
+          <input id="useRGBA" type="checkbox">
+          <label for="useRGBA">Use RGBA Half Float Texture Format</label><br/>
         </p>
       </details>
     </header>
@@ -79,26 +79,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           context: ctx.gl,
         });
 
-        // Set up the lighting estimation environment map
-        ctx.threeEnvMap = new THREE.CubeTexture(new Array(6));
-        ctx.envMap = ctx.gl.createTexture();
-        ctx.gl.bindTexture(ctx.gl.TEXTURE_CUBE_MAP, ctx.envMap);
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_POSITIVE_X, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_NEGATIVE_X, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_POSITIVE_Y, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_NEGATIVE_Y, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_POSITIVE_Z, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.texImage2D(ctx.gl.TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, ctx.gl.RGBA32F, 16, 16, 0, ctx.gl.RGBA, ctx.gl.FLOAT, new Float32Array(16 * 16 * 4).fill(100));
-        ctx.gl.bindTexture(ctx.gl.TEXTURE_CUBE_MAP, null);
-
-        // Hook into the THREE.js renderer properties for the environment so that we can manage the underlying texture.
-        let rendererProps = ctx.renderer.properties.get(ctx.threeEnvMap);
-        rendererProps.__webglInit = true;
-        rendererProps.__webglTexture = ctx.envMap;
-
         // Construct a Three.JS scene
         ctx.scene = new THREE.Scene();
 
+        // Set up the lighting estimation environment map, and then setup THREE
+        // to accept a webgl texture.
+        ctx.cubeTarget = new THREE.WebGLCubeRenderTarget(16);
+        ctx.threeEnvMap = ctx.cubeTarget.texture;
+        let rendererProps = ctx.renderer.properties.get(ctx.threeEnvMap);
+        rendererProps.__webglInit = true;
+
         // Set up the camera
         ctx.camera = new THREE.Camera(); // WebXR gives us the projection matrix to use, so don't bother with PerspectiveCamera
         ctx.scene.add(ctx.camera);
@@ -108,7 +98,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         ctx.material = new THREE.MeshStandardMaterial({ color: 0xFFFFFF, metalness: 0.0, roughness: 0.0 });
         ctx.sphere = new THREE.Mesh(ctx.geometry, ctx.material);
         ctx.scene.add(ctx.sphere);
-        ctx.sphere.position.y = 1;
+        ctx.sphere.position.z = -1;
         ctx.sphere.updateMatrix();
 
         // Set up light source
@@ -128,20 +118,37 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       }
 
       function onRequestSession(ctx) {
-        navigator.xr.requestSession('immersive-ar', {requiredFeatures: ['local-floor']}).then(session => {
+        navigator.xr.requestSession('immersive-ar', {requiredFeatures: ['local', 'light-estimation']}).then(session => {
           session.addEventListener('end', () => onSessionEnded(ctx));
 
           ctx.session = session;
           ctx.xrButton.setSession(session);
+          ctx.glBinding = new XRWebGLBinding(session, ctx.gl);
 
           session.updateRenderState({ baseLayer: new XRWebGLLayer(session, ctx.gl) });
-          session.requestReferenceSpace('local-floor').then(refSpace => onReceivedReferenceSpace(ctx, refSpace));
-          session.updateWorldTrackingState({ lightEstimationState: { enabled: true }});
+          session.requestReferenceSpace('local').then(refSpace => onReceivedReferenceSpace(ctx, refSpace));
+          session.requestLightProbe({reflectionFormat: "rgba16f"}).then((rgbaProbe) =>
+          {
+            ctx.rgbaProbe = rgbaProbe;
+            rgbaProbe.addEventListener('onreflectionchange', () => onReflectionChanged(ctx));
+          }).catch(err => console.error(err));
+
+          session.requestLightProbe().then((defaultProbe) => {
+            ctx.defaultProbe = defaultProbe;
+            defaultProbe.addEventListener('onreflectionchange', () => onReflectionChanged(ctx));
+          }).catch(err => console.error(err));
+
+          ctx.reflectionChanged = true;
+
 
           session.requestAnimationFrame((t, frame) => update(ctx, t, frame));
         });
       }
 
+      function onReflectionChanged(ctx) {
+        ctx.reflectionChanged = true;
+      }
+
       function onReceivedReferenceSpace(ctx, refSpace) {
         ctx.referenceSpace = refSpace;
       }
@@ -177,12 +184,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         }
 
         // Get ambient lighting estimation
-        if (frame.worldInformation.lightEstimation) {
-          ctx.light_probe.sh.fromArray(frame.worldInformation.lightEstimation.lightProbe.sphericalHarmonics.coefficients);
+        const lightProbe = document.getElementById('useRGBA').checked ? ctx.rgbaProbe : ctx.defaultProbe;
+        if (lightProbe) {
+          const estimate = frame.getLightEstimate(lightProbe);
+
+          if (estimate) {
+            ctx.light_probe.sh.fromArray(estimate.sphericalHarmonicsCoefficients);
+          } else {
+            console.log("light estimate not available");
+          }
 
-          // Update cubemap texture
-          frame.worldInformation.lightEstimation.reflectionProbe.cubeMap.updateWebGLEnvironmentCube(ctx.gl, ctx.envMap);
-          ctx.material.envMap = ctx.threeEnvMap;
+          if (ctx.reflectionChanged) {
+            const cubeMap = ctx.glBinding.getReflectionCubeMap(lightProbe);
+            if (cubeMap) {
+              let rendererProps = ctx.renderer.properties.get(ctx.threeEnvMap);
+              rendererProps.__webglTexture = cubeMap;
+            } else {
+              console.log("Cube map not available");
+            }
+            ctx.reflectionChanged = false;
+          }
         } else {
           console.log("Session light estimation not available");
         }
diff --git a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth-gpu.html b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth-gpu.html
index bf5d1ffe1be..3675cdd1ad6 100644
--- a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth-gpu.html
+++ b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth-gpu.html
@@ -26,6 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     <meta name='mobile-web-app-capable' content='yes'>
     <meta name='apple-mobile-web-app-capable' content='yes'>
 
+    <meta http-equiv="origin-trial" content="Ak33Pb+/wTIeP0Pih/o6Fh24UKfNcnp2BhFaMKv5cCS4a9/OXyngyq+QMK2QGlIQqye//UVrefnJ5VMM0gO8UwwAAABaeyJvcmlnaW4iOiJodHRwczovL3N0b3JhZ2UuZ29vZ2xlYXBpcy5jb206NDQzIiwiZmVhdHVyZSI6IldlYlhSRGVwdGgiLCJleHBpcnkiOjE2MDgyMjc4MjB9">
+
     <title>AR Depth API</title>
 
     <link href='../css/common.css' rel='stylesheet'></link>
diff --git a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth.html b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth.html
index 70af8352f2c..f7c6db54a95 100644
--- a/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth.html
+++ b/chromium/third_party/webxr_test_pages/webxr-samples/proposals/phone-ar-depth.html
@@ -26,6 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     <meta name='mobile-web-app-capable' content='yes'>
     <meta name='apple-mobile-web-app-capable' content='yes'>
 
+    <meta http-equiv="origin-trial" content="Ak33Pb+/wTIeP0Pih/o6Fh24UKfNcnp2BhFaMKv5cCS4a9/OXyngyq+QMK2QGlIQqye//UVrefnJ5VMM0gO8UwwAAABaeyJvcmlnaW4iOiJodHRwczovL3N0b3JhZ2UuZ29vZ2xlYXBpcy5jb206NDQzIiwiZmVhdHVyZSI6IldlYlhSRGVwdGgiLCJleHBpcnkiOjE2MDgyMjc4MjB9">
+
     <title>AR Depth API</title>
 
     <link href='../css/common.css' rel='stylesheet'></link>