Merge branch 'main' of https://github.com/WebKit/WebKit

Author: actions-user

JSTests/microbenchmarks/array-prototype-toSpliced-contiguous-contiguous.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => ({ v: i }));
+const insert = Array.from({ length: 32   }, (_, i) => ({ v: -i }));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/microbenchmarks/array-prototype-toSpliced-double-contiguous.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => i + 0.5);
+const insert = Array.from({ length: 32   }, (_, i) => ({ v: -i }));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/microbenchmarks/array-prototype-toSpliced-double-double.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => i + 0.5);
+const insert = Array.from({ length: 32   }, (_, i) => -(i + 0.25));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/microbenchmarks/array-prototype-toSpliced-int32-contiguous.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => i | 0);
+const insert = Array.from({ length: 32   }, (_, i) => ({ v: -i }));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/microbenchmarks/array-prototype-toSpliced-int32-double.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => i | 0);
+const insert = Array.from({ length: 32   }, (_, i) => -(i + 0.25));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/microbenchmarks/array-prototype-toSpliced-int32-int32.js

@@ -0,0 +1,18 @@
+function test(array, start, del, insert) {
+    return array.toSpliced(start, del, ...insert);
+}
+noInline(test);
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const src    = Array.from({ length: 1024 }, (_, i) => i | 0);
+const insert = Array.from({ length: 32   }, (_, i) => -(i | 0));
+
+let result;
+for (let i = 0; i < 1e5; ++i)
+    result = test(src, 496, 32, insert);
+
+shouldBe(result.length, 1024);

JSTests/stress/array-prototype-toSpliced-fast-path.js

@@ -0,0 +1,77 @@
+function sameArray(a, b) {
+    if (a.length !== b.length)
+        throw new Error(`length: expected ${b.length} but got ${a.length}`);
+    for (let i = 0; i < a.length; ++i) {
+        if (a[i] !== b[i])
+            throw new Error(`${i}: expected ${b[i]} but got ${a[i]}`);
+    }
+}
+
+/* int32 → int32, delete only */
+{
+    const src = [0, 1, 2, 3, 4, 5];
+    sameArray(src.toSpliced(2, 2), [0, 1, 4, 5]);
+    sameArray(src, [0, 1, 2, 3, 4, 5]);
+}
+
+/* int32 → int32, insert int32 */
+{
+    const src = [10, 11, 12, 13];
+    sameArray(src.toSpliced(2, 0, 99, 98), [10, 11, 99, 98, 12, 13]);
+    sameArray(src, [10, 11, 12, 13]);
+}
+
+/* int32 → double, insert double */
+{
+    const src = [1, 2, 3, 4];
+    sameArray(src.toSpliced(2, 1, 3.25, 4.25), [1, 2, 3.25, 4.25, 4]);
+    sameArray(src, [1, 2, 3, 4]);
+}
+
+/* int32 → contiguous, insert object */
+{
+    const src = [7, 8, 9];
+    const obj = { v: 42 };
+    sameArray(src.toSpliced(1, 1, obj), [7, obj, 9]);
+    sameArray(src, [7, 8, 9]);
+}
+
+/* double → double, delete last */
+{
+    const src = [0.5, 1.5, 2.5, 3.5];
+    sameArray(src.toSpliced(-1), [0.5, 1.5, 2.5]);
+    sameArray(src, [0.5, 1.5, 2.5, 3.5]);
+}
+
+/* double → double, insert int32 */
+{
+    const src = [5.5, 6.5, 7.5];
+    sameArray(src.toSpliced(1, 0, 100), [5.5, 100, 6.5, 7.5]);
+    sameArray(src, [5.5, 6.5, 7.5]);
+}
+
+/* double → contiguous, insert string & object */
+{
+    const src = [2.2, 3.3, 4.4];
+    const o = { x: 1 };
+    sameArray(src.toSpliced(0, 1, "str", o), ["str", o, 3.3, 4.4]);
+    sameArray(src, [2.2, 3.3, 4.4]);
+}
+
+/* contiguous → contiguous, delete middle */
+{
+    const a = { a: 1 };
+    const b = { b: 2 };
+    const c = { c: 3 };
+    const src = [a, b, c];
+    sameArray(src.toSpliced(1, 1), [a, c]);
+    sameArray(src, [a, b, c]);
+}
+
+/* contiguous → contiguous, insert mix */
+{
+    const src = ["x", "y", "z"];
+    sameArray(src.toSpliced(2, 0, 7, 8.8), ["x", "y", 7, 8.8, "z"]);
+    sameArray(src, ["x", "y", "z"]);
+}
+

JSTests/stress/array-prototype-toSpliced-hole-check.js

@@ -0,0 +1,22 @@
+function sameArray(a, b) {
+    if (a.length !== b.length)
+        throw new Error(`length: expected ${b.length} but got ${a.length}`);
+    for (let i = 0; i < a.length; ++i) {
+        if (a[i] !== b[i])
+            throw new Error(`${i}: expected ${b[i]} but got ${a[i]}`);
+    }
+}
+
+function shouldBe(a, b) {
+    if (a !== b)
+        throw new Error(`Expected ${b} but got ${a}`);
+}
+
+const array = [, , , 1, 2, 3, 4];
+const result = array.toSpliced(0, 0, 9, 8, 7);
+
+sameArray(result, [9, 8, 7, undefined, undefined, undefined, 1, 2, 3, 4]);
+
+shouldBe(Object.hasOwn(result, 3), true);
+shouldBe(Object.hasOwn(result, 4), true);
+shouldBe(Object.hasOwn(result, 5), true);

LayoutTests/TestExpectations

@@ -4589,19 +4589,15 @@ imported/w3c/web-platform-tests/css/css-fonts/font-weight-lighter-001.xht [ Imag
 imported/w3c/web-platform-tests/css/css-fonts/font-weight-normal-001.xht [ ImageOnlyFailure ]
 
 # webkit.org/b/203763 2019 WebGL test gardening: These tests pass in Safari and the conformance suite, but timeout in TestRunner and MiniBrowser.
-webgl/1.0.3/conformance/uniforms/gl-uniform-arrays.html [ Skip ]
 webgl/2.0.0/conformance2/rendering/blitframebuffer-filter-outofbounds.html [ Skip ]
 
 # webkit.org/b/203908 Tests generate inconsistent results or time out
 webgl/1.0.3/conformance/textures/texture-npot-video.html [ Skip ]
-webgl/1.0.3/conformance/canvas/rapid-resizing.html [ Skip ]
 
 # WebGL 2 Conformance Suite rules for regular bots post ANGLE backend adoption.
 # DEQP is skipped on the main fleet of bots because of the long run time.
 webgl/2.0.0/deqp [ Skip ]
 
-webkit.org/b/214893 [ Debug ] webgl/2.0.0/conformance/uniforms/gl-uniform-arrays.html [ Slow ]
-
 # webkit.org/b/208211 Additional inconsitencies between Intel bots and AMD machine
 webgl/2.0.0/conformance2/rendering/clipping-wide-points.html [ Pass Failure ]
 webgl/2.0.0/conformance2/textures/misc/tex-3d-size-limit.html [ Pass Failure ]
@@ -4698,12 +4694,12 @@ webkit.org/b/241027 webgl/2.0.0/conformance2/textures/image_bitmap_from_image_bi
 webgl/1.0.x [ Skip ]
 
 # Explicitly enable tests which we have fixed and do not have corresponding 1.0.3 test functionality.
-webgl/1.0.x/conformance/canvas/to-data-url-test.html [ Pass ]
 webgl/1.0.x/conformance/context/constants-and-properties.html [ Pass ]
 webgl/1.0.x/conformance/textures/misc/exif-orientation.html [ Pass ]
 
 webgl/1.0.x/conformance/attribs [ Pass ]
 webgl/1.0.x/conformance/buffers [ Pass ]
+webgl/1.0.x/conformance/canvas [ Pass ]
 webgl/1.0.x/conformance/context [ Pass ]
 webgl/1.0.x/conformance/extensions [ Pass ]
 webgl/1.0.x/conformance/glsl [ Pass ]
@@ -4718,6 +4714,7 @@ webgl/1.0.x/conformance/renderbuffers [ Pass ]
 webgl/1.0.x/conformance/rendering [ Pass ]
 webgl/1.0.x/conformance/state [ Pass ]
 webgl/1.0.x/conformance/textures/canvas/ [ Pass ]
+webgl/1.0.x/conformance/uniforms [ Pass Slow ]
 
 # Debug builds on slower machines run close to the time out especially with GPUP enabled
 webkit.org/b/238691 [ Debug ] webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Slow ]
@@ -4728,7 +4725,6 @@ webgl/2.0.y [ Skip ]
 webkit.org/b/254730 [ Debug ] webgl/2.0.y/conformance/extensions/webgl-compressed-texture-astc.html [ Slow ]
 
 # Explicitly enable tests which we have fixed and do not have corresponding 2.0.0 test functionality.
-webgl/2.0.y/conformance/canvas/to-data-url-test.html [ Pass ]
 webgl/2.0.y/conformance/textures/misc/exif-orientation.html [ Pass ]
 webgl/2.0.y/conformance/extensions/webgl-multi-draw.html [ Pass Slow ]
 webgl/2.0.y/conformance2/extensions/ext-texture-filter-anisotropic.html [ Pass ]
@@ -4738,13 +4734,15 @@ webgl/2.0.y/conformance2/state/gl-object-get-calls.html [ Pass Slow ]
 webgl/2.0.y/conformance2/vertex_arrays/vertex-array-object.html [ Pass ]
 webgl/2.0.y/conformance2/transform_feedback/transform_feedback.html [ Pass ]
 webgl/2.0.y/conformance2/transform_feedback/simultaneous_binding.html [ Pass ]
+webgl/2.0.y/conformance2/textures/misc/tex-unpack-params-with-flip-y-and-premultiply-alpha.html [ Pass ]
 webgl/1.0.x/conformance/extensions/oes-vertex-array-object.html [ Pass ]
 
 webgl/2.0.y/conformance2/offscreencanvas [ Pass ]
 
 # Explicitly turn on conformance test until all of webgl/2.0.y is enabled
 webgl/2.0.y/conformance/attribs [ Pass ]
 webgl/2.0.y/conformance/buffers [ Pass ]
+webgl/2.0.y/conformance/canvas [ Pass ]
 webgl/2.0.y/conformance/context [ Pass ]
 webgl/2.0.y/conformance/extensions [ Pass ]
 webgl/2.0.y/conformance/glsl [ Pass ]
@@ -4758,6 +4756,8 @@ webgl/2.0.y/conformance/reading [ Pass ]
 webgl/2.0.y/conformance/renderbuffers [ Pass ]
 webgl/2.0.y/conformance/rendering [ Pass ]
 webgl/2.0.y/conformance/textures/canvas/ [ Pass ]
+webgl/2.0.y/conformance2/canvas [ Pass ]
+webgl/2.0.y/conformance/uniforms [ Pass Slow ]
 webgl/2.0.y/conformance2/context [ Pass ]
 webgl/2.0.y/conformance2/extensions/ext-conservative-depth.html [ Pass ]
 webgl/2.0.y/conformance2/extensions/ext-render-snorm.html [ Pass ]
@@ -4777,8 +4777,10 @@ webgl/2.0.y/conformance2/rendering/rasterizer-discard-and-implicit-clear.html [
 webgl/2.0.y/conformance2/state [ Pass ]
 webgl/2.0.y/conformance2/textures/canvas/ [ Pass ]
 webgl/2.0.y/conformance2/textures/webgl_canvas [ Pass ]
+webgl/2.0.y/conformance2/uniforms [ Pass ]
 webgl/2.0.y/conformance2/wasm [ Pass ]
 
+
 webkit.org/b/282031 webgl/1.0.x/conformance/context/context-lost-restored.html [ Failure ]
 webkit.org/b/282031 webgl/1.0.x/conformance/context/context-lost.html [ Failure ]
 webkit.org/b/282031 webgl/1.0.x/conformance/offscreencanvas/context-lost-restored.html [ Failure ]
@@ -4792,6 +4794,7 @@ webkit.org/b/282031 webgl/2.0.y/conformance/offscreencanvas/context-lost.html [
 fast/canvas/webgl/invalid-passed-params.html [ Skip ]
 webgl/1.0.3/conformance/attribs [ Skip ]
 webgl/1.0.3/conformance/buffers [ Skip ]
+webgl/1.0.3/conformance/canvas [ Skip ]
 webgl/1.0.3/conformance/context [ Skip ]
 webgl/1.0.3/conformance/extensions [ Skip ]
 webgl/1.0.3/conformance/glsl [ Skip ]
@@ -4804,8 +4807,10 @@ webgl/1.0.3/conformance/reading [ Skip ]
 webgl/1.0.3/conformance/renderbuffers [ Skip ]
 webgl/1.0.3/conformance/rendering [ Skip ]
 webgl/1.0.3/conformance/state [ Skip ]
+webgl/1.0.3/conformance/uniforms [ Skip ]
 webgl/2.0.0/conformance/attribs [ Skip ]
 webgl/2.0.0/conformance/buffers [ Skip ]
+webgl/2.0.0/conformance/canvas [ Skip ]
 webgl/2.0.0/conformance/context [ Skip ]
 webgl/2.0.0/conformance/extensions [ Skip ]
 webgl/2.0.0/conformance/glsl [ Skip ]
@@ -4818,6 +4823,7 @@ webgl/2.0.0/conformance/reading [ Skip ]
 webgl/2.0.0/conformance/renderbuffers [ Skip ]
 webgl/2.0.0/conformance/rendering [ Skip ]
 webgl/2.0.0/conformance/textures/canvas/ [ Skip ]
+webgl/2.0.0/conformance/uniforms [ Skip ]
 webgl/2.0.0/conformance2/context [ Skip ]
 webgl/2.0.0/conformance2/context/constants-and-properties-2.html [ Skip ]
 webgl/2.0.0/conformance2/state [ Skip ]

LayoutTests/fast/css/nested-shadow-dom-css-container-query-expected.txt

@@ -0,0 +1,3 @@
+Tests CSS container queries don't break when using nested shadow DOM
+
+PASS if not crash