mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump chromium to 102.0.4962.3 (main) (#33447)

Browse source 
* chore: bump chromium in DEPS to 102.0.4962.3

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
electron-roller[bot] 2022-03-25 12:35:32 -05:00 committed by GitHub
parent 3c5c880a33
commit c11cd3c14c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'102.0.4961.0',
'102.0.4962.3',
'node_version':
'v16.14.2',
'nan_version':

12
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,7 +33,7 @@ index a6e0a53d4ebbd585114bc0cda2e2d1caaab4a015..95a7e70eee0303471702b81c68f46a0f
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f62b184e0 100644
index 5bbb64d83e2024feeb7a2eae45f6b8e937fc927c..20004fb890e726d11dc672894cdba4645b0a3606 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4508,7 +4508,7 @@ static_library("browser") {
@ -46,10 +46,10 @@ index fca255a2cd49f1f5d2bcb4418b04355c5befba38..2a0f3edc10a7ba48ee5a0efac0a6053f
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a197ae638 100644
index 3d7606b8d7d5f1ec61c9c00be0cc530967985e4b..044b52e00d8b334e90a9f1126b5bc3df916a1af3 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5904,7 +5904,6 @@ test("unit_tests") {
@@ -5907,7 +5907,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/browser:chrome_process_finder",
@@ -5927,6 +5926,10 @@ test("unit_tests") {
@@ -5930,6 +5929,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -6616,7 +6619,6 @@ test("unit_tests") {
@@ -6619,7 +6622,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index 3a3318c9586c88af0333d1b7586cbb426c205e7d..183d0c8ceb42a23424c3aa6d21c72e0a
"//chrome/browser:cart_db_content_proto",
"//chrome/browser:coupon_db_content_proto",
"//chrome/browser/media/router:test_support",
@@ -6662,6 +6664,11 @@ test("unit_tests") {
@@ -6664,6 +6666,11 @@ test("unit_tests") {
"//ui/native_theme:test_support",
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

4
patches/chromium/can_create_window.patch
View file

@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 20b9d7cd590361b176298e24b5aac6f546acb518..a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7 100644
index dc75ab59ff7af972c950a9be682ebd9cddce2627..a969bbaaecb4b589808413d40299b68f3bc1fd3e 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6866,6 +6866,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -6880,6 +6880,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
View file

@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 863c9e088c2d967506a9fabd044d7b08cc8bee23..fca255a2cd49f1f5d2bcb4418b04355c5befba38 100644
index 5f43b35aab6c2f277f0d021b378bee55f97572aa..5bbb64d83e2024feeb7a2eae45f6b8e937fc927c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7123,6 +7123,7 @@ static_library("browser") {
@@ -7126,6 +7126,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

2
patches/chromium/don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
View file

@ -6,7 +6,7 @@ Subject: Don't run PCScan functions if PCScan is disabled
PCScan should not be invoked if PCScan is disabled. Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/2916657.
diff --git a/base/allocator/partition_allocator/memory_reclaimer.cc b/base/allocator/partition_allocator/memory_reclaimer.cc
index 60a33e1501b58d486217d934de6f5c2c392e01bb..3b9ccdf82c6be5b12d32f053bedc5c6d1cd4bc0e 100644
index d871ceecd76e21b23c500643363ced2ca87e8013..e0a26a90ee38342aefdbdd76e9c56a932b214235 100644
--- a/base/allocator/partition_allocator/memory_reclaimer.cc
+++ b/base/allocator/partition_allocator/memory_reclaimer.cc
@@ -66,7 +66,7 @@ void MemoryReclaimer::Reclaim(int flags) {

2
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
View file

@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index ceeeedc42d9fe86383f9fda2b1a26d39119e655c..ff3b3cb47cbce01bcdcb28f1ef8a360143b2488f 100755
index 8cf820d7d1f5d9e85156a18e9ec573dbeb63d41a..a7d6ea676aaba90220761fa7ecc4569012806581 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -298,6 +298,8 @@ def GetDefaultHostOs():

4
patches/chromium/webview_fullscreen.patch
View file

@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index a6ed7b9f89b7fca2c6a6676053d520ba6c7716d7..dd8c421545d75cd8c9864b88701e0f9071259444 100644
index a969bbaaecb4b589808413d40299b68f3bc1fd3e..6e5d3ae228b98295bd95bad3cc58215a13c20106 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6253,6 +6253,15 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6267,6 +6267,15 @@ void RenderFrameHostImpl::EnterFullscreen(
notified_instances.insert(parent_site_instance);
}

6
patches/v8/build_gn.patch
View file

@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d274f922b 100644
index 8a09944249fb0c9ee77c49ed018d6e145265df6b..0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -605,7 +605,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -5819,7 +5819,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5818,7 +5818,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@ -30,7 +30,7 @@ index 076b75e2e5b3465ab3115f7186296c34f59480fc..7eaa7582fc1efc2381c267fec96fe94d
deps = [
":v8_libbase",
@@ -5857,6 +5857,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5856,6 +5856,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]

8
patches/v8/dcheck.patch
View file

@ -6,10 +6,10 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index f0f1355f590b37d4b0ff1b68124165ab61099cc1..15d94af6d969f93cefb21d82ddb7d508320bea30 100644
index e5a0e9fc7655bcc2359578e299b64952d6daa8a8..f15ccd03bc500b9a0095cb8581c6ffc143b29710 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -9088,7 +9088,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -9080,7 +9080,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {
@ -19,10 +19,10 @@ index f0f1355f590b37d4b0ff1b68124165ab61099cc1..15d94af6d969f93cefb21d82ddb7d508
isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index ccef6add27d782845a404741e4a42d07c86d0222..659f5187f80f74b3902facebe8f34d8898244093 100644
index f0ba31671416f1d77d3b1a5ecb76a0dd3954c8c2..0436b896522b31904512694d20f883470a646a0f 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -6152,9 +6152,9 @@ void Heap::TearDown() {
@@ -6151,9 +6151,9 @@ void Heap::TearDown() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback);

2
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View file

@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index 5338cdfd2067f1621ecb63ce8b8d1111e3677377..1f876cec9c66c2d92662c235ab5c9c608c242a37 100644
index 2262d19f0f9ced2c9e69862252d94ecb885c839f..2e5dcdd037f29cf51b2ff5d325a43036c8713f33 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -605,6 +605,10 @@ config("internal_config") {

4
patches/v8/export_symbols_needed_for_windows_build.patch
View file

@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build
These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
diff --git a/src/objects/objects.h b/src/objects/objects.h
index d57ad0a847ed1903228db4fb0650e1ca2922b608..de8947cb558455537e251f66cc3fe4f2f08c640b 100644
index 1e3950ab2292ce6a3e6a4e469d8327da28f2d899..5e9b17acc59590147d8b3e2d74f62050e6b5a7ec 100644
--- a/src/objects/objects.h
+++ b/src/objects/objects.h
@@ -910,7 +910,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
@@ -911,7 +911,7 @@ enum AccessorComponent { ACCESSOR_GETTER, ACCESSOR_SETTER };
// Utility superclass for stack-allocated objects that must be updated
// on gc. It provides two ways for the gc to update instances, either
// iterating or updating after gc.

4
patches/v8/expose_mksnapshot.patch
View file

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 7eaa7582fc1efc2381c267fec96fe94d274f922b..5338cdfd2067f1621ecb63ce8b8d1111e3677377 100644
index 0fdbf62eae3e5bc2d3b16a2084a59ba9c394446f..2262d19f0f9ced2c9e69862252d94ecb885c839f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5831,7 +5831,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5830,7 +5830,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

2
patches/v8/fix_disable_implies_dcheck_for_node_stream_array_buffers.patch
View file

@ -18,7 +18,7 @@ This patch can be removed when streams support rab/gsab, or
when support is synchronized across both v8 and node.
diff --git a/src/objects/js-array-buffer.cc b/src/objects/js-array-buffer.cc
index cd760b9e67820c6ab69164992bccf19411cf1db6..f28258bf1b797c2a2d904e25802a17b14ad0c19a 100644
index f2563ef61d3f5bc2d866f8c3366ca6c9ef8357a6..ed6180e28467df90ed8d91093ae9269a24e919db 100644
--- a/src/objects/js-array-buffer.cc
+++ b/src/objects/js-array-buffer.cc
@@ -72,9 +72,9 @@ void JSArrayBuffer::Attach(std::shared_ptr<BackingStore> backing_store) {