Upgrade to upstream WebKit 51cc3feb7298

.gitattributes

@@ -36,4 +36,4 @@ objc/*.h diff=objcppheader
 /Source/JavaScriptCore/b3/testb3*.cpp test=1
 /Source/JavaScriptCore/b3/air/testair.cpp test=1
 /Source/JavaScriptCore/dfg/testdfg.cpp test=1
-/Tools/TestWebKitAPI/**/* test=1
+/Tools/TestWebKitAPI/Tests/**/* test=1

.github/CODEOWNERS

@@ -101,16 +101,14 @@ AllowedSPI*.toml @emw-apple
 /Source/WebCore/editing @rniwa
 /LayoutTests/editing @rniwa
 
-/Source/WebCore/Modules/applepay @aprotyas
-/Source/WebCore/Modules/applepay-ams-ui @aprotyas
 /Source/WebCore/Modules/applicationmanifest/ @marcoscaceres
 /Source/WebCore/Modules/beacon @cdumez
 /Source/WebCore/Modules/contact-picker @marcoscaceres
 /Source/WebCore/Modules/entriesapi @cdumez
 /Source/WebCore/Modules/geolocation @cdumez @marcoscaceres
 /Source/WebCore/Modules/model-element @mwyrzykowski @etiennesegonzac
 /Source/WebCore/Modules/notifications @cdumez
-/Source/WebCore/Modules/paymentrequest @aprotyas @marcoscaceres
+/Source/WebCore/Modules/paymentrequest @marcoscaceres
 /Source/WebCore/Modules/permissions @marcoscaceres
 /Source/WebCore/Modules/credentialmanagement @marcoscaceres
 /Source/WebCore/Modules/gamepad @marcoscaceres
@@ -129,21 +127,21 @@ AllowedSPI*.toml @emw-apple
 /Source/WebCore/worklets @cdumez
 /Source/WebCore/xml @cdumez
 /Source/WebCore/page @cdumez
+/Source/WebCore/page/PointerCaptureController.cpp @lilyspiniolas
+/Source/WebCore/page/PointerCaptureController.h @lilyspiniolas
 ./Source/WebCore/page/Navigator.* @marcoscaceres
 
 /Source/WebCore/animation @graouts
 
-/LayoutTests/http/tests/paymentrequest @aprotyas @marcoscaceres
+/LayoutTests/http/tests/paymentrequest @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/badging @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/contenteditable @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/digital-credentials @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/gamepad @marcoscaceres
-/LayoutTests/http/tests/ssl/applepay @aprotyas
-/LayoutTests/http/tests/ssl/applepay-ams-ui @aprotyas
 /LayoutTests/imported/w3c/web-platform-tests/geolocation @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/html/user-activation @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/merchant-validation @marcoscaceres
-/LayoutTests/imported/w3c/web-platform-tests/payment-request @aprotyas @marcoscaceres
+/LayoutTests/imported/w3c/web-platform-tests/payment-request @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/permissions @marcoscaceres
 /LayoutTests/imported/w3c/web-platform-tests/resources @gsnedders
 /LayoutTests/imported/w3c/web-platform-tests/screen-orientation @marcoscaceres
@@ -163,9 +161,7 @@ AllowedSPI*.toml @emw-apple
 /Source/WebKit/NetworkProcess @cdumez
 /Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in @brentfulgham @pvollan
 /Source/WebKit/Platform @cdumez
-/Source/WebKit/Platform/*/Payment* @aprotyas
 /Source/WebKit/Resources/SandboxProfiles @brentfulgham @pvollan
-/Source/WebKit/Shared/ApplePay @aprotyas
 /Source/WebKit/Shared/Sandbox @brentfulgham @pvollan
 /Source/WebKit/UIProcess @cdumez
 /Source/WebKit/UIProcess/Extensions @b-weinstein @xeenon
@@ -175,7 +171,6 @@ AllowedSPI*.toml @emw-apple
 /Source/WebKit/WebProcess @cdumez
 /Source/WebKit/WebProcess/DigitalCredentials @marcoscaceres
 /Source/WebKit/WebKitSwift/IdentityDocumentServices @marcoscaceres
-/Source/WebKit/WebProcess/ApplePay @aprotyas
 /Source/WebKit/WebProcess/Extensions @b-weinstein @xeenon
 /Source/WebKit/WebProcess/Inspector @dcrousso @patrickangle @burg
 /Source/WebKit/WebProcess/com.apple.WebProcess.sb.in  @brentfulgham @pvollan

.wkdev-sdk-version

@@ -1 +1 @@
-2.53-v5-3bdf4b8
+2.53-v6-d535e88

CMakeLists.txt

@@ -10,33 +10,38 @@ cmake_minimum_required(VERSION 3.20)
 
 if (PORT STREQUAL "IOS")
     set(CMAKE_SYSTEM_NAME iOS)
-    if (NOT CMAKE_OSX_SYSROOT)
-        if (DEFINED ENV{SDKROOT} AND EXISTS "$ENV{SDKROOT}")
-            set(CMAKE_OSX_SYSROOT "$ENV{SDKROOT}" CACHE PATH "iOS SDK path" FORCE)
+    if (CMAKE_IOS_SIMULATOR)
+        set(_sdk_name "iphonesimulator.internal")
+        set(_sdk_name_fallback "iphonesimulator")
+    else ()
+        set(_sdk_name "iphoneos.internal")
+        set(_sdk_name_fallback "iphoneos")
+    endif ()
+    execute_process(COMMAND xcrun --sdk ${_sdk_name} --show-sdk-path
+        OUTPUT_VARIABLE _ios_sysroot
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE _internal_sdk_result
+        ERROR_QUIET)
+    if (NOT _internal_sdk_result EQUAL 0 OR NOT _ios_sysroot)
+        set(_ios_sysroot "")
+        if (CMAKE_OSX_SYSROOT AND EXISTS "${CMAKE_OSX_SYSROOT}")
+            set(_ios_sysroot "${CMAKE_OSX_SYSROOT}")
+        elseif (DEFINED ENV{SDKROOT} AND EXISTS "$ENV{SDKROOT}" AND "$ENV{SDKROOT}" MATCHES "iPhone")
+            set(_ios_sysroot "$ENV{SDKROOT}")
         else ()
-            if (CMAKE_IOS_SIMULATOR)
-                set(_sdk_name "iphonesimulator.internal")
-                set(_sdk_name_fallback "iphonesimulator")
-            else ()
-                set(_sdk_name "iphoneos.internal")
-                set(_sdk_name_fallback "iphoneos")
-            endif ()
-            execute_process(COMMAND xcrun --sdk ${_sdk_name} --show-sdk-path
+            execute_process(COMMAND xcrun --sdk ${_sdk_name_fallback} --show-sdk-path
                 OUTPUT_VARIABLE _ios_sysroot
                 OUTPUT_STRIP_TRAILING_WHITESPACE
-                RESULT_VARIABLE _internal_sdk_result
                 ERROR_QUIET)
-            if (NOT _internal_sdk_result EQUAL 0 OR NOT _ios_sysroot)
-                execute_process(COMMAND xcrun --sdk ${_sdk_name_fallback} --show-sdk-path
-                    OUTPUT_VARIABLE _ios_sysroot
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
-            endif ()
-            if (_ios_sysroot)
-                set(CMAKE_OSX_SYSROOT "${_ios_sysroot}" CACHE PATH "iOS SDK path" FORCE)
-            endif ()
         endif ()
     endif ()
+    if (_ios_sysroot)
+        set(CMAKE_OSX_SYSROOT "${_ios_sysroot}" CACHE PATH "iOS SDK path" FORCE)
+    endif ()
+    unset(_sdk_name)
+    unset(_sdk_name_fallback)
+    unset(_internal_sdk_result)
+    unset(_ios_sysroot)
 
     if (NOT CMAKE_OSX_ARCHITECTURES)
         if (CMAKE_OSX_SYSROOT MATCHES "\\.Internal\\.sdk$" AND NOT CMAKE_OSX_SYSROOT MATCHES "[Ss]imulator")
@@ -95,60 +100,39 @@ include(WebKitCommon)
 # "project()" line
 #------------------------------------------------------------------------------
 if (SWIFT_REQUIRED)
-    cmake_policy(SET CMP0157 NEW)
+    if (POLICY CMP0157)
+        cmake_policy(SET CMP0157 NEW)
+    endif ()
 
     # CMake omits -target for swiftc during iOS cross-compilation.
-    if (PORT STREQUAL "IOS" AND NOT CMAKE_Swift_COMPILER_TARGET)
-        if (CMAKE_OSX_SYSROOT MATCHES "[Ss]imulator")
+    if (PORT STREQUAL "IOS")
+        if (CMAKE_IOS_SIMULATOR OR CMAKE_OSX_SYSROOT MATCHES "[Ss]imulator")
             set(CMAKE_Swift_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "Swift target triple" FORCE)
         else ()
             set(CMAKE_Swift_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "Swift target triple" FORCE)
         endif ()
     endif ()
 
-    if (PORT STREQUAL "IOS")
-        execute_process(COMMAND xcrun --show-sdk-platform-path
-            OUTPUT_VARIABLE _ios_platform_path
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            ERROR_QUIET)
-        if (_ios_platform_path)
-            execute_process(COMMAND find "${_ios_platform_path}" -name swiftc -path "*/xctoolchain/*" -type f -print -quit
-                OUTPUT_VARIABLE _ios_swiftc
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-                ERROR_QUIET)
-            if (_ios_swiftc AND NOT _ios_swiftc STREQUAL CMAKE_Swift_COMPILER)
-                set(CMAKE_Swift_COMPILER "${_ios_swiftc}" CACHE FILEPATH "Swift compiler" FORCE)
-                message(STATUS "iOS: using platform-specific Swift compiler: ${_ios_swiftc}")
-            endif ()
-        endif ()
-    endif ()
-
     enable_language(Swift)
 
     # -F causes Swift to find C++23 framework headers in implicit module builds.
     if (PORT STREQUAL "IOS")
         set(CMAKE_Swift_FRAMEWORK_SEARCH_FLAG "-Xcc -iquote")
     endif ()
 
-    # Override Swift compiler to a wrapper script to work around the
-    # fact CMake feeds incorrect flags to swiftc.
-    set(_swift_wrapper "${CMAKE_SOURCE_DIR}/Tools/Scripts/swift/swiftc-wrapper.sh")
-    if (CMAKE_Swift_COMPILER STREQUAL _swift_wrapper)
-        if (NOT ORIGINAL_Swift_COMPILER)
-            find_program(ORIGINAL_Swift_COMPILER NAMES swiftc REQUIRED)
-        endif ()
+    if (APPLE)
+        WEBKIT_XCRUN(ORIGINAL_Swift_COMPILER --find swiftc)
     else ()
-        set(ORIGINAL_Swift_COMPILER "${CMAKE_Swift_COMPILER}" CACHE FILEPATH "Original Swift compiler" FORCE)
+        set(ORIGINAL_Swift_COMPILER "${CMAKE_Swift_COMPILER}")
     endif ()
-    set(CMAKE_Swift_COMPILER "${_swift_wrapper}")
+    set(CMAKE_Swift_COMPILER "${CMAKE_SOURCE_DIR}/Tools/Scripts/swift/swiftc-wrapper.sh")
     add_compile_options($<$<COMPILE_LANGUAGE:Swift>:--original-swift-compiler=${ORIGINAL_Swift_COMPILER}>)
     add_link_options($<$<LINK_LANGUAGE:Swift>:--original-swift-compiler=${ORIGINAL_Swift_COMPILER}>)
     # The static archive rule (<CMAKE_Swift_CREATE_STATIC_LIBRARY>) uses neither
     # <FLAGS> nor link options, so inject the flag directly into the template.
     string(REPLACE "<CMAKE_Swift_COMPILER>"
         "<CMAKE_Swift_COMPILER> --original-swift-compiler=${ORIGINAL_Swift_COMPILER}"
         CMAKE_Swift_CREATE_STATIC_LIBRARY "${CMAKE_Swift_CREATE_STATIC_LIBRARY}")
-    unset(_swift_wrapper)
 endif ()
 
 # -----------------------------------------------------------------------------

CMakePresets.json

@@ -92,7 +92,7 @@
                 },
                 "CMAKE_MAKE_PROGRAM": {
                     "type": "FILEPATH",
-                    "value": "${sourceDir}/Tools/Scripts/caffeinate-ninja"
+                    "value": "${sourceDir}/Source/cmake/ninja-wrapper"
                 }
             },
             "environment": {

Configurations/CommonBase.xcconfig

@@ -74,6 +74,8 @@ _EXPERIMENTAL_SWIFT_EXPLICIT_MODULES = YES;
 WK_DEFAULT_COMPILATION_CACHE_ENABLE_CACHING = YES;
 COMPILATION_CACHE_ENABLE_CACHING = $(WK_DEFAULT_COMPILATION_CACHE_ENABLE_CACHING);
 
+FUSE_BUILD_SCRIPT_PHASES = YES;
+
 WK_COMMON_OTHER_LDFLAGS = $(WK_SANITIZER_OTHER_LDFLAGS) $(WK_COMMON_OTHER_LDFLAGS_INSTRUMENTATION_$(ENABLE_LLVM_PROFILE_GENERATION));
 // Work around rdar://151083138 by moving the section the profiling runtime
 // mmaps to its own segment.
@@ -83,7 +85,7 @@ OTHER_LDFLAGS = $(inherited) $(WK_COMMON_OTHER_LDFLAGS);
 WK_COMMON_OTHER_TAPI_FLAGS = -x objective-c++ -std=c++2b -fno-rtti $(WK_SANITIZER_OTHER_TAPI_FLAGS);
 OTHER_TAPI_FLAGS = $(inherited) $(WK_COMMON_OTHER_TAPI_FLAGS);
 
-WK_DEFAULT_WK_AUDIT_SPI[sdk=iphoneos*] = $(WK_NOT_$(WK_OR_$(WK_ANY_SANITIZER_ENABLED)_$(OVERRIDE_SUPPORTS_TEXT_BASED_API)));
+WK_DEFAULT_WK_AUDIT_SPI[sdk=iphoneos*] = $(WK_AND_$(WK_NOT_$(WK_ANY_SANITIZER_ENABLED))_$(OVERRIDE_SUPPORTS_TEXT_BASED_API:default=YES));
 // Explicitly disable auditing on other embedded platforms, because some SDKs
 // fall back to reading settings for iOS.
 WK_DEFAULT_WK_AUDIT_SPI[sdk=appletvos*] = ;
@@ -127,7 +129,7 @@ WK_SWIFT_CLANG_DEPLOYMENT_TARGET = $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET_$(WK_PLATF
 WK_SWIFT_CLANG_DEPLOYMENT_TARGET_macosx = -clang-target $(CURRENT_ARCH)-apple-macos$(MACOSX_DEPLOYMENT_TARGET);
 
 // rdar://170129992: remove -track-system-dependencies when resolved
-OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fvisibility=hidden -Werror ExistentialAny -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS) -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility -track-system-dependencies -enable-experimental-feature ImportCxxMembersLazily;
+OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fvisibility=hidden -Werror ExistentialAny -Werror NoUseUnstructuredThrowingTask -enable-upcoming-feature ExistentialAny $(WK_SWIFT_MEMORY_SAFETY_FLAGS) $(WK_SWIFT_MEMORY_SAFETY_ERROR_FLAGS) $(WK_SWIFT_CLANG_DEPLOYMENT_TARGET) $(WK_SANITIZER_OTHER_SWIFT_FLAGS) -enable-upcoming-feature InternalImportsByDefault -enable-upcoming-feature MemberImportVisibility -track-system-dependencies -enable-experimental-feature ImportCxxMembersLazily;
 // Work around rdar://157581667 on affected toolchains.
 OTHER_SWIFT_FLAGS[sdk=*26.2*] = $(inherited) -Xcc -fno-modulemap-allow-subdirectory-search;
 OTHER_SWIFT_FLAGS[sdk=*26.3*] = $(inherited) -Xcc -fno-modulemap-allow-subdirectory-search;

JSTests/microbenchmarks/array-iterator-fast-entries.js

@@ -0,0 +1,17 @@
+// Microbenchmark: fast iteration over array.entries() (allocates [index, element] per step).
+
+function arrayEntriesSum(arr) {
+    var sum = 0;
+    for (var [k, v] of arr.entries())
+        sum += k + v;
+    return sum;
+}
+noInline(arrayEntriesSum);
+
+var arr = [];
+for (var i = 0; i < 1024; ++i)
+    arr.push(i);
+
+var iters = 2e4;
+for (var i = 0; i < iters; ++i)
+    arrayEntriesSum(arr);

JSTests/microbenchmarks/array-iterator-fast-keys.js

@@ -0,0 +1,17 @@
+// Microbenchmark: fast iteration over array.keys() (no element load needed).
+
+function arrayKeysSum(arr) {
+    var sum = 0;
+    for (var k of arr.keys())
+        sum += k;
+    return sum;
+}
+noInline(arrayKeysSum);
+
+var arr = [];
+for (var i = 0; i < 1024; ++i)
+    arr.push(i);
+
+var iters = 4e4;
+for (var i = 0; i < iters; ++i)
+    arrayKeysSum(arr);

JSTests/microbenchmarks/array-iterator-fast-values.js

@@ -0,0 +1,36 @@
+// Microbenchmark: fast iteration over array.keys()/values()/entries().
+
+function arrayValues(arr) {
+    var sum = 0;
+    for (var v of arr.values())
+        sum += v;
+    return sum;
+}
+noInline(arrayValues);
+
+function arrayKeys(arr) {
+    var sum = 0;
+    for (var k of arr.keys())
+        sum += k;
+    return sum;
+}
+noInline(arrayKeys);
+
+function arrayEntries(arr) {
+    var sum = 0;
+    for (var [k, v] of arr.entries())
+        sum += k + v;
+    return sum;
+}
+noInline(arrayEntries);
+
+var arr = [];
+for (var i = 0; i < 1024; ++i)
+    arr.push(i);
+
+var iters = 1e4;
+for (var i = 0; i < iters; ++i) {
+    arrayValues(arr);
+    arrayKeys(arr);
+    arrayEntries(arr);
+}

JSTests/microbenchmarks/array-prototype-lastIndexOf-double-large.js

@@ -0,0 +1,15 @@
+function test(array, searchElement) {
+    return array.lastIndexOf(searchElement);
+}
+noInline(test);
+
+var array = new Array(1024);
+for (var i = 0; i < array.length; i++)
+    array[i] = i + 0.5;
+
+var result = 0;
+for (var i = 0; i < 1e6; ++i)
+    result += test(array, -1.0); // absent: forces a full backward scan, returns -1
+
+if (result !== -1e6)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/bigint-heap-dec.js

@@ -0,0 +1,14 @@
+function test(start, count) {
+    let n = start;
+    for (let i = 0; i < count; i++)
+        n--;
+    return n;
+}
+noInline(test);
+
+const start = 0x123456789abcdef0123456789abcdefn;
+let result = 0n;
+for (let i = 0; i < 2000; i++)
+    result = test(start, 2000);
+if (result !== start - 2000n)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/bigint-heap-inc.js

@@ -0,0 +1,14 @@
+function test(start, count) {
+    let n = start;
+    for (let i = 0; i < count; i++)
+        n++;
+    return n;
+}
+noInline(test);
+
+const start = 0x123456789abcdef0123456789abcdefn;
+let result = 0n;
+for (let i = 0; i < 2000; i++)
+    result = test(start, 2000);
+if (result !== start + 2000n)
+    throw new Error("bad result: " + result);

JSTests/microbenchmarks/intl-string-tolocalelowercase.js

@@ -0,0 +1,14 @@
+function test() {
+    let count = 0;
+    for (let i = 0; i < 1e5; ++i) {
+        if ("Hello World".toLocaleLowerCase() === "hello world")
+            ++count;
+        if ("HELLO WORLD".toLocaleLowerCase("en") === "hello world")
+            ++count;
+    }
+    return count;
+}
+
+const result = test();
+if (result !== 2e5)
+    throw new Error("Bad result: " + result);

JSTests/microbenchmarks/intl-string-tolocaleuppercase.js

@@ -0,0 +1,14 @@
+function test() {
+    let count = 0;
+    for (let i = 0; i < 1e5; ++i) {
+        if ("Hello World".toLocaleUpperCase() === "HELLO WORLD")
+            ++count;
+        if ("hello world".toLocaleUpperCase("en") === "HELLO WORLD")
+            ++count;
+    }
+    return count;
+}
+
+const result = test();
+if (result !== 2e5)
+    throw new Error("Bad result: " + result);

JSTests/microbenchmarks/map-clone-large.js

@@ -0,0 +1,11 @@
+function test(map) {
+    return new Map(map);
+}
+noInline(test);
+
+var map = new Map();
+for (var j = 0; j < 1000; ++j)
+    map.set(j, j);
+
+for (var i = 0; i < testLoopCount; ++i)
+    test(map);