Skip to content

Commit 02af664

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 <[email protected]> Co-authored-by: deepak1556 <[email protected]> Co-authored-by: John Kleinschmidt <[email protected]>
1 parent 715d694 commit 02af664

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

+2-2
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

+1-1
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

+2-2
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

+2-2
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

+3
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

+1-3
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

+2
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

+3-3
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

+2-2
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

+1-1
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 @@

‎patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
1111
patch.
1212

1313
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
14-
index b1c18a03ccd05609cd65de028b9861c6c9a71568..f507a8cd4b35f577c5b06712145beaa067a1bb79 100644
14+
index f40c70d840845fdb6171ab6ba4cdcf92dbfd9965..7d762b40f44d8dc3cd1cb63c56a188f9bdced1fe 100644
1515
--- a/chrome/BUILD.gn
1616
+++ b/chrome/BUILD.gn
1717
@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index b1c18a03ccd05609cd65de028b9861c6c9a71568..f507a8cd4b35f577c5b06712145beaa0
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 696bb78b317178168d78b9619651cafd1bddd5ac..21262f51f5ebe12b396a453b30f067de00b0f376 100644
36+
index 46219ca4fbc09900414526a1e3b8980be79cd29c..bc4a61474cfd88f95485dcd80185b3be3db2b855 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4534,7 +4534,7 @@ static_library("browser") {
39+
@@ -4532,7 +4532,7 @@ static_library("browser") {
4040
]
4141
}
4242

@@ -46,10 +46,10 @@ index 696bb78b317178168d78b9619651cafd1bddd5ac..21262f51f5ebe12b396a453b30f067de
4646
# than here in :chrome_dll.
4747
deps += [ "//chrome:packed_resources_integrity_header" ]
4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 68129387f96ac7c54b1c762dbb2cc001e929b3f5..da12c25bfd3377862c27c74a343ba2a0d4ff1411 100644
49+
index 04996332eac1c4a30db285ff875ebbec982b9055..353a5c6e4d9a7bdee57a3f2f6d0c563a34a66fa1 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -6714,9 +6714,12 @@ test("unit_tests") {
52+
@@ -6723,9 +6723,12 @@ test("unit_tests") {
5353
"//chrome/notification_helper",
5454
]
5555

@@ -63,7 +63,7 @@ index 68129387f96ac7c54b1c762dbb2cc001e929b3f5..da12c25bfd3377862c27c74a343ba2a0
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -7671,6 +7674,10 @@ test("unit_tests") {
66+
@@ -7682,6 +7685,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index 68129387f96ac7c54b1c762dbb2cc001e929b3f5..da12c25bfd3377862c27c74a343ba2a0
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -7723,7 +7730,6 @@ test("unit_tests") {
77+
@@ -7734,7 +7741,6 @@ test("unit_tests") {
7878
# Non-android deps for "unit_tests" target.
7979
deps += [
8080
"../browser/screen_ai:screen_ai_install_state",

‎patches/chromium/build_make_libcxx_abi_unstable_false_for_electron.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: build: make libcxx_abi_unstable false for electron
66
https://nornagon.medium.com/a-libc-odyssey-973e51649063
77

88
diff --git a/buildtools/third_party/libc++/__config_site b/buildtools/third_party/libc++/__config_site
9-
index 39cc404dda7ba408438deeaa5b65a01cdd696dcb..355a774a08fb6eb6fa435c4704e8ff9cb5a9f5bd 100644
9+
index 260a4a9772a625ff02d66faffdd6937215402261..6e485725c967ca27d8ffe6b52c47dddd0d82bd7e 100644
1010
--- a/buildtools/third_party/libc++/__config_site
1111
+++ b/buildtools/third_party/libc++/__config_site
1212
@@ -18,7 +18,9 @@

‎patches/chromium/can_create_window.patch

+13-13
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12-
index ea7a56f9ebab820bc50167d1f6848078d59f4737..e0708cae6968c14f912bac9c8c7ff90344454237 100644
12+
index 98c865765c57d3387c9193df0fab73bae678983a..f737902ba9a5ff5b98940eca4a8e7c057c64b3bd 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -9104,6 +9104,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -9115,6 +9115,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1616
last_committed_origin_, params->window_container_type,
1717
params->target_url, params->referrer.To<Referrer>(),
1818
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index ea7a56f9ebab820bc50167d1f6848078d59f4737..e0708cae6968c14f912bac9c8c7ff903
2121
&no_javascript_access);
2222

2323
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24-
index 62854bb03a4e72b716a823ee7fafbb011a86ebb0..06ca908e1668050bb87609406fa4dc9eff9b6adf 100644
24+
index f25b2cc6c138a4e201b6ec9f74f9cb5734195f24..c67be0c23f8b8d6f49ee82e1617c0f3cfee5c9ab 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -4772,6 +4772,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27+
@@ -4781,6 +4781,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2828
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
2929
opener);
3030

@@ -37,7 +37,7 @@ index 62854bb03a4e72b716a823ee7fafbb011a86ebb0..06ca908e1668050bb87609406fa4dc9e
3737
// If the new frame has a name, make sure any SiteInstances that can find
3838
// this named frame have proxies for it. Must be called after
3939
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
40-
@@ -4813,12 +4819,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
40+
@@ -4822,12 +4828,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
4141
AddWebContentsDestructionObserver(new_contents_impl);
4242
}
4343

@@ -66,10 +66,10 @@ index 61ee456a1bfb842aefd8b644ff0ae630a698ef7c..cbf4276337139a81d46fb263bce8f5ee
6666

6767
// Operation result when the renderer asks the browser to create a new window.
6868
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
69-
index e73432790e5bbd03dc3eb2a2d8c89d77d21430cc..5f60458d39e3554832b63c201e79633cf0219951 100644
69+
index 21967547790cacc162d9b125e60ca24919b6b485..af7126cec088e5ece113dfbea19674421182abaa 100644
7070
--- a/content/public/browser/content_browser_client.cc
7171
+++ b/content/public/browser/content_browser_client.cc
72-
@@ -760,6 +760,8 @@ bool ContentBrowserClient::CanCreateWindow(
72+
@@ -765,6 +765,8 @@ bool ContentBrowserClient::CanCreateWindow(
7373
const std::string& frame_name,
7474
WindowOpenDisposition disposition,
7575
const blink::mojom::WindowFeatures& features,
@@ -79,7 +79,7 @@ index e73432790e5bbd03dc3eb2a2d8c89d77d21430cc..5f60458d39e3554832b63c201e79633c
7979
bool opener_suppressed,
8080
bool* no_javascript_access) {
8181
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
82-
index 7326a96f8b615e7dd7f5077faab98a6a198209bd..ff16736f47ad642211ee21b44479c5e449acf33f 100644
82+
index 0f6781dc459e1072e1f538b2c60c21699b175852..ad94803577af27c84e247ace2137995a9ca886e0 100644
8383
--- a/content/public/browser/content_browser_client.h
8484
+++ b/content/public/browser/content_browser_client.h
8585
@@ -196,6 +196,7 @@ class NetworkService;
@@ -90,7 +90,7 @@ index 7326a96f8b615e7dd7f5077faab98a6a198209bd..ff16736f47ad642211ee21b44479c5e4
9090
} // namespace network
9191

9292
namespace sandbox {
93-
@@ -1322,6 +1323,8 @@ class CONTENT_EXPORT ContentBrowserClient {
93+
@@ -1325,6 +1326,8 @@ class CONTENT_EXPORT ContentBrowserClient {
9494
const std::string& frame_name,
9595
WindowOpenDisposition disposition,
9696
const blink::mojom::WindowFeatures& features,
@@ -100,7 +100,7 @@ index 7326a96f8b615e7dd7f5077faab98a6a198209bd..ff16736f47ad642211ee21b44479c5e4
100100
bool opener_suppressed,
101101
bool* no_javascript_access);
102102
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
103-
index 9d14f11ef397a525633292dbedfed40f38a9ec8f..49bc6ce731ea06cae8281107dbaa527060ffd4ce 100644
103+
index 784103345ed40cce8823048bcd6a48c722866f15..94202a07c8774a9ad62938506b22ea3f72916372 100644
104104
--- a/content/public/browser/web_contents_delegate.cc
105105
+++ b/content/public/browser/web_contents_delegate.cc
106106
@@ -31,6 +31,17 @@ namespace content {
@@ -122,7 +122,7 @@ index 9d14f11ef397a525633292dbedfed40f38a9ec8f..49bc6ce731ea06cae8281107dbaa5270
122122
WebContents* source,
123123
const OpenURLParams& params,
124124
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
125-
index 294dc13ec8f27875c28b459b56b166f2c8f4a2ff..1a58077807de673e1937f3323c8dc37b4c69468e 100644
125+
index 19dff7ea3f62e5095ee03335978dac5d58cc1465..cbec82fe1fbc43c188ac9c0cf318ee49aa83c503 100644
126126
--- a/content/public/browser/web_contents_delegate.h
127127
+++ b/content/public/browser/web_contents_delegate.h
128128
@@ -17,6 +17,7 @@
@@ -163,7 +163,7 @@ index 1fd3487243760d5a64bcd27f7022d8d0326bab65..21ecced6578552e30c1a01841053f679
163163
// moved on send.
164164
bool is_background_tab =
165165
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
166-
index 9e564b2be92aefc2b58617de92dd8d519c3c784f..bf096ab972cc945d19473cc1e55f6f7fc9618778 100644
166+
index b181f3d7429cdccfede3803b0659fc877d68e884..874753add7c176871fee299d32199ebfd9526c68 100644
167167
--- a/content/web_test/browser/web_test_content_browser_client.cc
168168
+++ b/content/web_test/browser/web_test_content_browser_client.cc
169169
@@ -520,6 +520,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -176,7 +176,7 @@ index 9e564b2be92aefc2b58617de92dd8d519c3c784f..bf096ab972cc945d19473cc1e55f6f7f
176176
bool opener_suppressed,
177177
bool* no_javascript_access) {
178178
diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
179-
index 4145d0d32ca1d1f02620a66f2437eaa58954b4d7..3cb5faab3f2e60d919dd7dd76fd320b8c63de84f 100644
179+
index 126fe65469971b91e763a5e7640649dff1a096c4..398feea2aec7ece17d62259320db9035edabeccd 100644
180180
--- a/content/web_test/browser/web_test_content_browser_client.h
181181
+++ b/content/web_test/browser/web_test_content_browser_client.h
182182
@@ -92,6 +92,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {

‎patches/chromium/chore_introduce_blocking_api_for_electron.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
77
of explicitly adding ScopedAllowBlocking calls as friends.
88

99
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
10-
index 965206e18e7a536947354c734ef17196c3e736ff..8a8a687d33f725aacf736a20ffc600cdf3fb05e4 100644
10+
index 149838be725f2e09274421d087ce4494ecf4bc1d..17bdae284536b0445bf539651bd6e152a0cb5c6b 100644
1111
--- a/base/threading/thread_restrictions.h
1212
+++ b/base/threading/thread_restrictions.h
1313
@@ -132,6 +132,7 @@ class KeyStorageLinux;
@@ -28,15 +28,15 @@ index 965206e18e7a536947354c734ef17196c3e736ff..8a8a687d33f725aacf736a20ffc600cd
2828
namespace enterprise_connectors {
2929
class LinuxKeyRotationCommand;
3030
} // namespace enterprise_connectors
31-
@@ -580,6 +584,7 @@ class BASE_EXPORT ScopedAllowBlocking {
31+
@@ -583,6 +587,7 @@ class BASE_EXPORT ScopedAllowBlocking {
3232
friend class ::DesktopNotificationBalloon;
3333
friend class ::FirefoxProfileLock;
3434
friend class ::GaiaConfig;
3535
+ friend class ::ProcessSingleton;
3636
friend class ::ProfileImpl;
3737
friend class ::ScopedAllowBlockingForProfile;
3838
friend class ::StartupTabProviderImpl;
39-
@@ -620,6 +625,7 @@ class BASE_EXPORT ScopedAllowBlocking {
39+
@@ -623,6 +628,7 @@ class BASE_EXPORT ScopedAllowBlocking {
4040
friend class crosapi::LacrosThreadTypeDelegate;
4141
friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847
4242
friend class drive::FakeDriveService;

‎patches/chromium/chore_partial_revert_of.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
1414
by changing something in Electron.
1515

1616
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
17-
index 2841e3c1b0cb1bb538c91e18d83ac81ff230d130..14119e672dda39a5ac49f6ef561036a624559f68 100644
17+
index c1e2bf39aa70776b7e3b26ac78c82995cd376c58..c26d53d7555cbdaae5c167aabf49135afb667259 100644
1818
--- a/content/browser/web_contents/web_contents_impl.cc
1919
+++ b/content/browser/web_contents/web_contents_impl.cc
20-
@@ -4698,9 +4698,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
20+
@@ -4707,9 +4707,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2121
bool renderer_started_hidden =
2222
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;
2323

0 commit comments

Comments
 (0)