Skip to content

Commit

Permalink
Merge branch 'upstream' into merge-upstream-2023-12-18
Browse files Browse the repository at this point in the history
  • Loading branch information
mnutt committed Dec 19, 2023
2 parents a3f87ca + 843894c commit ba31823
Show file tree
Hide file tree
Showing 17,038 changed files with 858,677 additions and 346,975 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Editor configuration, see https://editorconfig.org

[*.{c,cpp,h,rb}]
[*.{c,cpp,h,rb,py,pl}]
indent_style = space
indent_size = 4
tab_width = 4
Expand Down
36 changes: 27 additions & 9 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@
# ================================================================================
# Web Inspector

/Source/JavaScriptCore/debugger @patrickangle
/Source/JavaScriptCore/inspector @patrickangle
/Source/WebCore/inspector @patrickangle
/Source/JavaScriptCore/debugger @dcrousso @patrickangle
/Source/JavaScriptCore/inspector @dcrousso @patrickangle
/Source/WebCore/inspector @dcrousso @patrickangle
/Source/WebInspectorUI @dcrousso @patrickangle
/Source/WebKit/UIProcess/Inspector @patrickangle
/Source/WebKit/WebProcess/Inspector @patrickangle
/Tools/Scripts/webkitpy/inspector @patrickangle
/LayoutTests/http/tests/inspector @patrickangle
/LayoutTests/http/tests/websocket/tests/hybi/inspector @patrickangle
/LayoutTests/inspector @patrickangle
/Source/WebKit/UIProcess/Inspector @dcrousso @patrickangle
/Source/WebKit/WebProcess/Inspector @dcrousso @patrickangle
/Tools/Scripts/webkitpy/inspector @dcrousso @patrickangle
/LayoutTests/http/tests/inspector @dcrousso @patrickangle
/LayoutTests/http/tests/websocket/tests/hybi/inspector @dcrousso @patrickangle
/LayoutTests/inspector @dcrousso @patrickangle

# ================================================================================
# WebCore
Expand Down Expand Up @@ -166,6 +166,11 @@
/Source/cmake/WebKitCompilerFlags.cmake @mcatanzaro
/Source/cmake/WebKitFeatures.cmake @mcatanzaro

# ================================================================================
# Xcode

*.xcconfig @emw-apple

# ================================================================================
# Linux graphics

Expand Down Expand Up @@ -205,6 +210,19 @@ xdg/ @WebKit/glib-reviewers
wpe/ @WebKit/glib-reviewers @zdobersek
**/wpe/qt/ @philn

# Don't want to own these
/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util/ar/testdata/linux
/Source/ThirdParty/libwebrtc/Source/third_party/libaom/source/config/linux
/Source/ThirdParty/libwebrtc/Source/third_party/libvpx/source/config/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/examples/peerconnection/client/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/modules/audio_device/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/modules/desktop_capture/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/modules/video_capture/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/test/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/tools_webrtc/audio_quality/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/tools_webrtc/video_quality_toolchain/linux
/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_tools/testing/golang/linux

/LayoutTests/platform/glib/
/LayoutTests/platform/gtk/
/LayoutTests/platform/gtk4/
Expand Down
53 changes: 53 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,39 @@
"name": "gtk-dev-debug",
"displayName": "GTK Development Debug",
"inherits": ["gtk-debug", "dev"]
},
{
"name": "wpe",
"hidden": true,
"generator": "Ninja",
"cacheVariables": {
"PORT": {
"type": "STRING",
"value": "WPE"
}
}
},
{
"name": "wpe-release",
"displayName": "WPE Release",
"inherits": ["wpe", "release"],
"binaryDir": "WebKitBuild/WPE/Release"
},
{
"name": "wpe-debug",
"displayName": "WPE Debug",
"inherits": ["wpe", "debug"],
"binaryDir": "WebKitBuild/WPE/Debug"
},
{
"name": "wpe-dev-release",
"displayName": "WPE Development Release",
"inherits": ["wpe-release", "dev"]
},
{
"name": "wpe-dev-debug",
"displayName": "WPE Development Debug",
"inherits": ["wpe-debug", "dev"]
}
],
"buildPresets": [
Expand All @@ -98,6 +131,26 @@
"name": "gtk-dev-debug",
"displayName": "GTK Development Debug",
"configurePreset": "gtk-dev-debug"
},
{
"name": "wpe-release",
"displayName": "WPE Release",
"configurePreset": "wpe-release"
},
{
"name": "wpe-debug",
"displayName": "WPE Debug",
"configurePreset": "wpe-debug"
},
{
"name": "wpe-dev-release",
"displayName": "WPE Development Release",
"configurePreset": "wpe-dev-release"
},
{
"name": "wpe-dev-debug",
"displayName": "WPE Development Debug",
"configurePreset": "wpe-dev-debug"
}
]
}
5 changes: 1 addition & 4 deletions Configurations/CommonBase.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GCC_OPTIMIZATION_LEVEL = $(WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_$(WK_ANY
WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_NO = $(WK_DEFAULT_GCC_OPTIMIZATION_LEVEL);
WK_GCC_OPTIMIZATION_LEVEL_SANITIZER_OVERRIDE_YES = $(WK_SANITIZER_GCC_OPTIMIZATION_LEVEL);

WK_COMMON_OTHER_CFLAGS = $(WK_LIBFUZZER_OTHER_FLAGS) $(WK_SANITIZER_OTHER_CFLAGS);
WK_COMMON_OTHER_CFLAGS = $(WK_SANITIZER_OTHER_CFLAGS);
OTHER_CFLAGS = $(inherited) $(WK_COMMON_OTHER_CFLAGS);

WK_COMMON_OTHER_CPLUSPLUSFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS) $(WK_SANITIZER_OTHER_CPLUSPLUSFLAGS);
Expand All @@ -58,9 +58,6 @@ OTHER_TAPI_FLAGS = $(inherited) $(WK_COMMON_OTHER_TAPI_FLAGS);
WK_COMMON_WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wextra -Wformat=2 -Wundef;
WARNING_CFLAGS = $(inherited) $(WK_COMMON_WARNING_CFLAGS);

WK_LIBFUZZER_OTHER_FLAGS = $(WK_ENABLE_LIBFUZZER_$(ENABLE_LIBFUZZER));
WK_ENABLE_LIBFUZZER_YES = -DENABLE_LIBFUZZER=1;

WK_LIBCPP_ASSERTIONS_CFLAGS = $(WK_LIBCPP_ASSERTIONS_CFLAGS_$(WK_PLATFORM_NAME));
WK_LIBCPP_ASSERTIONS_CFLAGS_iphoneos = $(WK_LIBCPP_ASSERTIONS_CFLAGS$(WK_IOS_17));
WK_LIBCPP_ASSERTIONS_CFLAGS_iphonesimulator = $(WK_LIBCPP_ASSERTIONS_CFLAGS$(WK_IOS_17));
Expand Down
11 changes: 8 additions & 3 deletions Configurations/Sanitizers.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Debug = 0;
WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Production = 1;
WK_SANITIZER_GCC_OPTIMIZATION_LEVEL_Release = 1;

WK_SANITIZER_OTHER_CFLAGS = $(WK_ANY_SANITIZER_CFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_ADDRESS_SANITIZER_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)) $(WK_LIBFUZZER_OTHER_CFLAGS_$(ENABLE_LIBFUZZER));
WK_SANITIZER_OTHER_CFLAGS = $(WK_ANY_SANITIZER_CFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_ADDRESS_SANITIZER_OTHER_CFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER)) $(WK_LIBFUZZER_OTHER_CFLAGS_$(ENABLE_LIBFUZZER)) $(WK_FUZZILLI_OTHER_CFLAGS_$(ENABLE_FUZZILLI));

WK_SANITIZER_OTHER_CPLUSPLUSFLAGS = $(WK_ADDRESS_SANITIZER_OTHER_CPLUSPLUSFLAGS_$(ENABLE_ADDRESS_SANITIZER)) $(WK_LIBFUZZER_OTHER_CPLUSPLUSFLAGS_$(ENABLE_LIBFUZZER));

WK_SANITIZER_OTHER_LDFLAGS = $(WK_ANY_SANITIZER_LDFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_LIBFUZZER_OTHER_LDFLAGS_$(ENABLE_LIBFUZZER));
WK_SANITIZER_OTHER_LDFLAGS = $(WK_ANY_SANITIZER_LDFLAGS_$(WK_ANY_SANITIZER_ENABLED)) $(WK_LIBFUZZER_OTHER_LDFLAGS_$(ENABLE_LIBFUZZER)) $(WK_FUZZILLI_OTHER_LDFLAGS_$(ENABLE_FUZZILLI));

WK_SANITIZER_OTHER_TAPI_FLAGS = $(WK_SANITIZER_OTHER_TAPI_FLAGS_ASAN_$(ENABLE_ADDRESS_SANITIZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_LIBFUZZER_$(ENABLE_LIBFUZZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_TSAN_$(ENABLE_THREAD_SANITIZER)) $(WK_SANITIZER_OTHER_TAPI_FLAGS_UBSAN_$(ENABLE_UNDEFINED_BEHAVIOR_SANITIZER));
WK_SANITIZER_OTHER_TAPI_FLAGS_ASAN_YES = -Xparser -fsanitize=address;
Expand Down Expand Up @@ -92,5 +92,10 @@ WK_UNDEFINED_BEHAVIOR_SANITIZER_OTHER_CFLAGS_YES = -fno-delete-null-pointer-chec
// Libfuzzer

WK_LIBFUZZER_COVERAGE = inline-8bit-counters,trace-cmp;
WK_LIBFUZZER_OTHER_CFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE) -Wno-error;
WK_LIBFUZZER_OTHER_CFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE) -Wno-error -DENABLE_LIBFUZZER=1;
WK_LIBFUZZER_OTHER_LDFLAGS_YES = -fsanitize-coverage=$(WK_LIBFUZZER_COVERAGE);

// Fuzzilli for JavaScriptCore

WK_FUZZILLI_OTHER_CFLAGS_YES = -fsanitize-coverage=trace-pc-guard -DENABLE_FUZZILLI=1;
WK_FUZZILLI_OTHER_LDFLAGS_YES = -fsanitize-coverage=trace-pc-guard;
2 changes: 1 addition & 1 deletion Configurations/Version.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

MAJOR_VERSION = 618;
MINOR_VERSION = 1;
TINY_VERSION = 5;
TINY_VERSION = 10;
MICRO_VERSION = 0;
NANO_VERSION = 0;
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
Expand Down
2 changes: 1 addition & 1 deletion JSTests/complex/temporal-now-timezone-check.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ function shouldBe(actual, expected) {
throw new Error('bad value: ' + actual);
}

shouldBe(Temporal.Now.timeZone().id, `America/Los_Angeles`);
shouldBe(Temporal.Now.timeZoneId(), `America/Los_Angeles`);
2 changes: 1 addition & 1 deletion JSTests/complex/temporal-now-timezone-with-broken-tz.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ function shouldBe(actual, expected) {
throw new Error('bad value: ' + actual);
}

shouldBe(Temporal.Now.timeZone().id, `UTC`);
shouldBe(Temporal.Now.timeZoneId(), `UTC`);
115 changes: 115 additions & 0 deletions JSTests/microbenchmarks/define-properties-all-of-keys.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
const properties = {
closed: {
get() {
return this._writableState ? this._writableState.closed : false;
},
},
destroyed: {
get() {
return this._writableState ? this._writableState.destroyed : false;
},
set(value) {
if (this._writableState) {
this._writableState.destroyed = value;
}
},
},
writable: {
get() {
const w = this._writableState;
return (
!!w &&
w.writable !== false &&
!w.destroyed &&
!w.errored &&
!w.ending &&
!w.ended
);
},
set(val) {
if (this._writableState) {
this._writableState.writable = !!val;
}
},
},
writableFinished: {
get() {
return this._writableState ? this._writableState.finished : false;
},
},
writableObjectMode: {
get() {
return this._writableState ? this._writableState.objectMode : false;
},
},
writableBuffer: {
get() {
return this._writableState && this._writableState.getBuffer();
},
},
writableEnded: {
get() {
return this._writableState ? this._writableState.ending : false;
},
},
writableNeedDrain: {
get() {
const wState = this._writableState;
if (!wState) return false;
return !wState.destroyed && !wState.ending && wState.needDrain;
},
},
writableHighWaterMark: {
get() {
return this._writableState && this._writableState.highWaterMark;
},
},
writableCorked: {
get() {
return this._writableState ? this._writableState.corked : 0;
},
},
writableLength: {
get() {
return this._writableState && this._writableState.length;
},
},
errored: {
enumerable: false,
get() {
return this._writableState ? this._writableState.errored : null;
},
},
writableAborted: {
enumerable: false,
get: function () {
return !!(
this._writableState.writable !== false &&
(this._writableState.destroyed || this._writableState.errored) &&
!this._writableState.finished
);
},
},
};

var count = 10_000;

function test() {
var first;
{
function Hey() {
return this;
}
Object.defineProperties(Hey.prototype, properties);
first = Object.getOwnPropertyDescriptors(Hey.prototype);
}

for (let i = 0; i < count; i++) {
function Hey() {
return this;
}
Object.defineProperties(Hey.prototype, first);
}
}

test();
Loading

0 comments on commit ba31823

Please sign in to comment.