Skip to content

Commit 6308858

Browse files
electron-roller[bot]nornagondeepak1556jkleinsc
authored and
yangannyx
committed
chore: bump chromium to 131.0.6776.0 (main) (electron#44137)
* chore: bump chromium in DEPS to 131.0.6763.0 * chore: bump chromium in DEPS to 131.0.6764.0 * update patches * chore: bump chromium in DEPS to 131.0.6766.0 * chore: update patches * Use PathInfo in FileSystemAccess code Refs https://chromium-review.googlesource.com/c/chromium/src/+/5872329 * Modernize image utilities. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5905226 * [DevTools] move feature flags to the devtools directory Refs https://chromium-review.googlesource.com/c/chromium/src/+/5913878 * chore: bump chromium in DEPS to 131.0.6768.0 * chore: update patches * Remove experimental credshelper flags Refs bazelbuild/reclient@4017a6c * Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap Refs https://chromium-review.googlesource.com/c/chromium/src/+/5917286 Refs https://chromium-review.googlesource.com/c/chromium/src/+/5905621 * chore: script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 131.0.6770.0 * chore: update patches * chore: bump chromium in DEPS to 131.0.6772.0 * chore: update patches * [UI] Add alias for mojo version of `MenuSourceType` Refs https://chromium-review.googlesource.com/c/chromium/src/+/5803393 * Update Background Color for Task Manager Refresh Refs https://chromium-review.googlesource.com/c/chromium/src/+/5875259 * chore: bump chromium in DEPS to 131.0.6774.0 * chore: bump chromium in DEPS to 131.0.6776.0 * chore: update patches * chore: update filenames.libcxx.gni * esm: remove --no-import-harmony-assertions nodejs/node#54890 * 5507047: [import-attributes] Remove support for import assertions | https://chromium-review.googlesource.com/c/v8/v8/+/5507047 * fixup: Change gfx::[PNG|JPEG]Codec::Decode to return a SkBitmap * chore: bump chromium in DEPS to 131.0.6778.0 * Revert "chore: bump chromium in DEPS to 131.0.6778.0" This reverts commit fb9092f. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <nornagon@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
1 parent 03fd26b commit 6308858

File tree

59 files changed

+395
-325
lines changed

Some content is hidden

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

59 files changed

+395
-325
lines changed

‎.github/workflows/pipeline-segment-electron-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ jobs:
187187
HELPER=$(node -p "require('./src/utils/reclient.js').helperPath({})")
188188
$HELPER login
189189
echo 'RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $GITHUB_ENV
190-
echo 'RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV
191-
echo 'RBE_experimental_credentials_helper_args=print' >> $GITHUB_ENV
190+
echo 'RBE_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV
191+
echo 'RBE_credentials_helper_args=print' >> $GITHUB_ENV
192192
- name: Free up space (macOS)
193193
if: ${{ inputs.target-platform == 'macos' }}
194194
uses: ./src/electron/.github/actions/free-space-macos

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'131.0.6762.0',
5+
'131.0.6776.0',
66
'node_version':
77
'v20.18.0',
88
'nan_version':

‎appveyor-woa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ for:
121121
- ps: >-
122122
$env:RBE_service = node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"
123123
- ps: >-
124-
$env:RBE_experimental_credentials_helper = $env:RECLIENT_HELPER
124+
$env:RBE_credentials_helper = $env:RECLIENT_HELPER
125125
- ps: >-
126-
$env:RBE_experimental_credentials_helper_args = "print"
126+
$env:RBE_credentials_helper_args = "print"
127127
- ps: >-
128128
if ($env:ELECTRON_RBE_JWT -eq '') {
129129
$env:RBE_fail_early_min_action_count = "0"

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ for:
116116
- ps: >-
117117
$env:RBE_service = node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"
118118
- ps: >-
119-
$env:RBE_experimental_credentials_helper = $env:RECLIENT_HELPER
119+
$env:RBE_credentials_helper = $env:RECLIENT_HELPER
120120
- ps: >-
121-
$env:RBE_experimental_credentials_helper_args = "print"
121+
$env:RBE_credentials_helper_args = "print"
122122
- ps: >-
123123
if ($env:ELECTRON_RBE_JWT -eq '') {
124124
$env:RBE_fail_early_min_action_count = "0"

‎chromium_src/BUILD.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ static_library("chrome") {
3030
"//chrome/browser/devtools/devtools_file_system_indexer.cc",
3131
"//chrome/browser/devtools/devtools_file_system_indexer.h",
3232
"//chrome/browser/devtools/devtools_settings.h",
33+
"//chrome/browser/devtools/features.cc",
34+
"//chrome/browser/devtools/features.h",
3335
"//chrome/browser/devtools/visual_logging.cc",
3436
"//chrome/browser/devtools/visual_logging.h",
3537
"//chrome/browser/extensions/global_shortcut_listener.cc",
@@ -195,6 +197,7 @@ static_library("chrome") {
195197
"//chrome/app/vector_icons",
196198
"//chrome/browser:resource_prefetch_predictor_proto",
197199
"//chrome/browser/resource_coordinator:mojo_bindings",
200+
"//chrome/browser/task_manager/common:impl",
198201
"//chrome/browser/ui/webui/tab_search:mojo_bindings",
199202
"//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
200203
"//components/enterprise/buildflags",

‎default_app/main.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ async function loadApplicationPackage (packagePath: string) {
9393
try {
9494
process.emitWarning = () => {};
9595
packageJson = (await import(url.pathToFileURL(packageJsonPath).toString(), {
96-
assert: {
97-
type: 'json'
98-
}
96+
with: { type: 'json' }
9997
})).default;
10098
} catch (e) {
10199
showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);

‎filenames.libcxx.gni

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ libcxx_headers = [
749749
"//third_party/libc++/src/include/__type_traits/common_type.h",
750750
"//third_party/libc++/src/include/__type_traits/conditional.h",
751751
"//third_party/libc++/src/include/__type_traits/conjunction.h",
752+
"//third_party/libc++/src/include/__type_traits/container_traits.h",
752753
"//third_party/libc++/src/include/__type_traits/copy_cv.h",
753754
"//third_party/libc++/src/include/__type_traits/copy_cvref.h",
754755
"//third_party/libc++/src/include/__type_traits/datasizeof.h",
@@ -789,6 +790,7 @@ libcxx_headers = [
789790
"//third_party/libc++/src/include/__type_traits/is_floating_point.h",
790791
"//third_party/libc++/src/include/__type_traits/is_function.h",
791792
"//third_party/libc++/src/include/__type_traits/is_fundamental.h",
793+
"//third_party/libc++/src/include/__type_traits/is_implicit_lifetime.h",
792794
"//third_party/libc++/src/include/__type_traits/is_implicitly_default_constructible.h",
793795
"//third_party/libc++/src/include/__type_traits/is_integral.h",
794796
"//third_party/libc++/src/include/__type_traits/is_literal_type.h",

‎patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ index 7de8923518dbfb69fef62d7781f906b30cf62155..7a4310d6d8e85f07f0ae6c97726d909c
2020

2121
case ssl_open_record_error:
2222
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
23-
index 1458b456e5251b058e28c7f935f929af7addbee4..994e1c330255ffcc5212dd69fb77d3044068717c 100644
23+
index c84c50710475f5e0ac8633bb97abafdca7fb324f..724d854540ced9b57a7fc804f61fff89f6f9fadf 100644
2424
--- a/ssl/ssl_lib.cc
2525
+++ b/ssl/ssl_lib.cc
26-
@@ -1343,7 +1343,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
26+
@@ -1335,7 +1335,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
2727
}
2828

2929
if (ret_code == 0) {
@@ -32,7 +32,7 @@ index 1458b456e5251b058e28c7f935f929af7addbee4..994e1c330255ffcc5212dd69fb77d304
3232
return SSL_ERROR_ZERO_RETURN;
3333
}
3434
// An EOF was observed which violates the protocol, and the underlying
35-
@@ -2725,13 +2725,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
35+
@@ -2707,13 +2707,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
3636
return CRYPTO_get_ex_data(&ctx->ex_data, idx);
3737
}
3838

‎patches/chromium/add_didinstallconditionalfeatures.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ index b9aff56f283b10e899c2291f90615cbd3795454c..59f040cead445b02442404c787c1015c
123123
int32_t world_id) override;
124124

125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index 821447d9510b7bffce71bb9cb797c95e526fe890..b1f4f8abdd2b4d1a669274f55588d6d936f0c691 100644
126+
index 3756c89c0ae70a802506aeac66ea26093831d88f..0d65071421e21edd77de0d2463061e6a05049121 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -416,6 +416,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -415,6 +415,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/build_add_electron_tracing_category.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
88
to introduce a new Electron category for Electron-specific tracing.
99

1010
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
11-
index 6d5a8547adb3eafa8c6ead798e21f18c217da256..f3508a818e2b8ecc0bd910d4be54b311e33b1837 100644
11+
index 5ba3046b83e881574470dc551745b855c785e05c..8d417c70a6e1b959353563d25ec6ff532ae34573 100644
1212
--- a/base/trace_event/builtin_categories.h
1313
+++ b/base/trace_event/builtin_categories.h
1414
@@ -88,6 +88,7 @@

0 commit comments

Comments
 (0)