Skip to content

Commit 8f32e9e

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 09e6084 + 96471cc commit 8f32e9e

File tree

4,366 files changed

+251612
-942791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,366 files changed

+251612
-942791
lines changed

.submitproject

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
[submitproject "filter"]
22
includedSubdirectoryPatterns = Configurations/
33
includedSubdirectoryPatterns = Source/
4+
includedSubdirectoryPatterns = WebKitLibraries/SDKs/*.internal-additions.sdk/
45
excludedSubdirectoryPatterns = Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util
56
excludedSubdirectoryPatterns = Source/ThirdParty/libwebrtc/Source/webrtc/examples
7+
excludedSubdirectoryPatterns = Source/ThirdParty/capstone
8+
excludedSubdirectoryPatterns = Source/ThirdParty/d3flamegraphjs
9+
excludedSubdirectoryPatterns = Source/ThirdParty/d3js
10+
excludedSubdirectoryPatterns = Source/ThirdParty/gmock
11+
excludedSubdirectoryPatterns = Source/ThirdParty/gtest
12+
excludedSubdirectoryPatterns = Source/ThirdParty/libsysprof-capture
13+
excludedSubdirectoryPatterns = Source/ThirdParty/qunit
614
excludedSubdirectoryPatterns = Source/ThirdParty/skia
15+
excludedSubdirectoryPatterns = Source/ThirdParty/unifdef
16+
excludedSubdirectoryPatterns = Source/ThirdParty/xdgmime
717
[submitproject "gitmodules"]
818
enabled = false

.submitproject-tools

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[submitproject "filter"]
2+
includedSubdirectoryPatterns = Tools/DumpRenderTree
3+
includedSubdirectoryPatterns = Tools/ImageDiff
4+
includedSubdirectoryPatterns = Tools/MiniBrowser
5+
includedSubdirectoryPatterns = Tools/TestRunnerShared
6+
includedSubdirectoryPatterns = Tools/WebKitTestRunner
7+
excludedSubdirectoryPatterns = Tools/WebKitTestRunner/gtk

Configurations/Version.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
MAJOR_VERSION = 621;
2525
MINOR_VERSION = 1;
26-
TINY_VERSION = 4;
26+
TINY_VERSION = 5;
2727
MICRO_VERSION = 0;
2828
NANO_VERSION = 0;
2929
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);

Configurations/WebKitProjectPaths.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,5 @@ WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS
154154
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
155155
ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/ $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/;
156156
LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc;
157+
LIBWEBM_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webm $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webm;
157158
WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU $(SDK_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
function test(str, regexp) {
3+
str.match(regexp);
4+
}
5+
noInline(test);
6+
7+
let str = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
8+
let regexp = /aaaaa/g;
9+
for (let i = 0; i < 1e4; i++) {
10+
test(str, regexp);
11+
}
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
function test(str, regexp) {
3+
str.match(regexp);
4+
}
5+
noInline(test);
6+
7+
let str = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
8+
let regexp = /a/g;
9+
for (let i = 0; i < 1e4; i++) {
10+
test(str, regexp);
11+
}
12+

JSTests/microbenchmarks/substring-match-global-atom.js renamed to JSTests/microbenchmarks/global-atom-substring-match-multi-chars.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ let regexp = /aaaaaaaaaa/g;
1010
for (let i = 0; i < 1e4; i++) {
1111
test(str, regexp);
1212
}
13-
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
function test(str, regexp) {
3+
str.substring(0, 50).match(regexp);
4+
str.substring(0, 60).match(regexp);
5+
}
6+
noInline(test);
7+
8+
let str = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
9+
let regexp = /\n/g;
10+
for (let i = 0; i < 1e4; i++) {
11+
test(str, regexp);
12+
}
13+

JSTests/stress/in-by-val-profile.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
function shouldThrow(op, errorConstructor) {
2+
try {
3+
op();
4+
} catch (e) {
5+
if (!(e instanceof errorConstructor)) {
6+
throw new Error(`threw ${e}, but should have thrown ${errorConstructor.name}`);
7+
}
8+
return;
9+
}
10+
throw new Error(`Expected to throw ${errorConstructor.name}, but no exception thrown`);
11+
}
12+
13+
const df = new Intl.DurationFormat();
14+
15+
{
16+
const invalidValues = [
17+
2**32,
18+
2**32 + 1,
19+
Number.MAX_SAFE_INTEGER,
20+
Number.MAX_VALUE,
21+
];
22+
for (const v of invalidValues) {
23+
shouldThrow(() => { df.format({ years: v }); }, RangeError);
24+
shouldThrow(() => { df.format({ months: v }); }, RangeError);
25+
shouldThrow(() => { df.format({ weeks: v }); }, RangeError);
26+
}
27+
}
28+
29+
{
30+
shouldThrow(() => { df.format({ days: Math.ceil((Number.MAX_SAFE_INTEGER + 1) / 86400) }); }, RangeError)
31+
shouldThrow(() => { df.format({ hours: Math.ceil((Number.MAX_SAFE_INTEGER + 1) / 3600) }) }, RangeError);
32+
shouldThrow(() => { df.format({ minutes: Math.ceil((Number.MAX_SAFE_INTEGER + 1) / 60) }) }, RangeError);
33+
shouldThrow(() => { df.format({ seconds: Number.MAX_SAFE_INTEGER + 1 }) }, RangeError);
34+
shouldThrow(() => { df.format({ milliseconds: (Number.MAX_SAFE_INTEGER + 1) * 1e3 }) }, RangeError);
35+
shouldThrow(() => { df.format({ milliseconds: 9007199254740992_000 }) }, RangeError);
36+
shouldThrow(() => { df.format({ microseconds: (Number.MAX_SAFE_INTEGER + 1) * 1e6 }) }, RangeError);
37+
shouldThrow(() => { df.format({ microseconds: 9007199254740992_000_000 }) }, RangeError);
38+
shouldThrow(() => { df.format({ nanoseconds: (Number.MAX_SAFE_INTEGER + 1) * 1e9 }) }, RangeError);
39+
shouldThrow(() => { df.format({ nanoseconds: 9007199254740992_000_000_000 }) }, RangeError);
40+
}

0 commit comments

Comments
 (0)