Skip to content

Commit 59dd17f

Browse files
electron-roller[bot]deepak1556jkleinscpatchup[bot]codebytere
authored
chore: bump chromium to 102.0.4989.0 (main) (electron#33557)
* chore: bump chromium in DEPS to 102.0.4975.0 * chore: bump chromium in DEPS to 102.0.4977.0 * chore: update patches * Remove parameter of OnGpuProcessCrashed() https://chromium-review.googlesource.com/c/chromium/src/+/3543396 * hid: Add exclusionFilters option to requestDevice https://chromium-review.googlesource.com/c/chromium/src/+/3478175 * chore: bump chromium in DEPS to 102.0.4979.0 * chore: bump chromium in DEPS to 102.0.4981.0 * chore: update patches * Deny notification/push permission for documents in non-standard StoragePartitions https://chromium-review.googlesource.com/c/chromium/src/+/3257305 * Improve FrameTreeNode tracking in URLLoaderNetworkContext https://chromium-review.googlesource.com/c/chromium/src/+/3341866 * fixup! Remove parameter of OnGpuProcessCrashed() * chore: fix lint * Reland "Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome" https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * chore: bump chromium in DEPS to 102.0.4983.0 * Ensure EyeDropperView does not access a destroyed window https://chromium-review.googlesource.com/c/chromium/src/+/3561542 * ci: don't delete dawn .git directory 83901: Adds a generated file with the dawn git hash encoded at build time. | https://dawn-review.googlesource.com/c/dawn/+/83901 * ci: update Windows toolchain 3550827: New toolchain for Windows 10 20348 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/3550827 * chore: bump chromium in DEPS to 102.0.4985.0 * chore: update patches * chore: bump chromium in DEPS to 102.0.4987.0 * chore: update patches * 3563432: codehealth: remove uses of DictionaryValue in cbui/webui https://chromium-review.googlesource.com/c/chromium/src/+/3563432 * chore: update patches after rebase * Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * 3565724: Preserve "proper method names" as-is in error.stack. https://chromium-review.googlesource.com/c/v8/v8/+/3565724 * chore: bump chromium in DEPS to 102.0.4989.0 * chore: update patches * fixup ci: don't delete dawn .git directory for Windows * 3560843: Remove multi-parameter version of gfx::Rect[F]::Inset() https://chromium-review.googlesource.com/c/chromium/src/+/3560843 * 3572711: Remove unused IDS_PDF_TOOLTIP_ROTATE_CW resource. https://chromium-review.googlesource.com/c/chromium/src/+/3572711 * 3572926: Reland "[Sysroot] Switch to Debian Bullseye stable" https://chromium-review.googlesource.com/c/chromium/src/+/3572926 * build: fixup sysroots with electron specific dependencies * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * fixup 3565724: Preserve "proper method names" as-is in error.stack. * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * test: add spec for navigator.hid.requestDevice({ exclusionFilters: [...] } * fixup 3565724: Preserve "proper method names" as-is in error.stack. * ci: use python3 to get the windows toolchain profile 3525960: Explicitly run everything with python3 | https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3525960 * chore: add diagnostic logging * fix: try calling process.crash() * chore: remove logging Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent e8ed9cb commit 59dd17f

File tree

90 files changed

+973
-443
lines changed

Some content is hidden

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

90 files changed

+973
-443
lines changed

‎.circleci/build_config.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,17 +431,19 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
431431
background: true
432432

433433
# On macOS delete all .git directories under src/ expect for
434-
# third_party/angle/ because of build time generation of file
434+
# third_party/angle/ and third_party/dawn/ because of build time generation of files
435435
# gen/angle/commit.h depends on third_party/angle/.git/HEAD
436436
# https://chromium-review.googlesource.com/c/angle/angle/+/2074924
437+
# and dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
438+
# https://dawn-review.googlesource.com/c/dawn/+/83901
437439
# TODO: maybe better to always leave out */.git/HEAD file for all targets ?
438440
step-delete-git-directories: &step-delete-git-directories
439441
run:
440442
name: Delete all .git directories under src on MacOS to free space
441443
command: |
442444
if [ "`uname`" == "Darwin" ]; then
443445
cd src
444-
( find . -type d -name ".git" -not -path "./third_party/angle/*" ) | xargs rm -rf
446+
( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" ) | xargs rm -rf
445447
fi
446448
447449
# On macOS the yarn install command during gclient sync was run on a linux

‎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-
'102.0.4971.0',
5+
'102.0.4989.0',
66
'node_version':
77
'v16.14.2',
88
'nan_version':

‎appveyor.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
version: 1.0.{build}
2727
build_cloud: electron-16-core
28-
image: vs2019bt-16.6.2
28+
image: vs2019bt-16.16.11
2929
environment:
3030
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
3131
ELECTRON_OUT_DIR: Default
@@ -150,6 +150,12 @@ build_script:
150150
if ($LASTEXITCODE -ne 0) {
151151
Write-warning "Failed to add third_party\angle\.git; continuing anyway"
152152
}
153+
# build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
154+
# https://dawn-review.googlesource.com/c/dawn/+/83901
155+
$(7z a $zipfile src\third_party\dawn\.git)
156+
if ($LASTEXITCODE -ne 0) {
157+
Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
158+
}
153159
}
154160
- cd src
155161
- set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn
@@ -172,7 +178,7 @@ build_script:
172178
- ninja -C out/Default electron:electron_chromedriver_zip
173179
- ninja -C out/Default third_party/electron_node:headers
174180
- python %LOCAL_GOMA_DIR%\goma_ctl.py stat
175-
- python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
181+
- python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
176182
- 7z a node_headers.zip out\Default\gen\node_headers
177183
# Temporarily disable symbol generation on 32-bit Windows due to failures
178184
- ps: >-

‎chromium_src/BUILD.gn‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ static_library("chrome") {
6969
"//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
7070
"//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
7171
"//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
72+
"//chrome/browser/ui/native_window_tracker.h",
7273
"//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
7374
"//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
7475
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -119,6 +120,8 @@ static_library("chrome") {
119120
if (use_aura) {
120121
sources += [
121122
"//chrome/browser/platform_util_aura.cc",
123+
"//chrome/browser/ui/aura/native_window_tracker_aura.cc",
124+
"//chrome/browser/ui/aura/native_window_tracker_aura.h",
122125
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
123126
]
124127
}

‎lib/browser/api/app.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from 'fs';
22

3-
import { Menu } from 'electron/main';
3+
import { Menu, deprecate } from 'electron/main';
44

55
const bindings = process._linkedBinding('electron_browser_app');
66
const commandLine = process._linkedBinding('electron_common_command_line');
@@ -111,3 +111,7 @@ for (const name of events) {
111111
webContents.emit(name, event, ...args);
112112
});
113113
}
114+
115+
// Deprecation.
116+
deprecate.event(app, 'gpu-process-crashed', 'child-process-gone');
117+
deprecate.event(app, 'renderer-process-crashed', 'render-process-gone');

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index 9f840287967b50ec1db3a9d27973429ab231a486..731a279e395a8762a25a115665bff99be428de3d 100644
13+
index 660c5f35c6095b23cc483c8eb1c119c215dc681d..961c0d7f7a9fe5f9e130998aeb0c872c571b710e 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -239,6 +239,10 @@ int GpuMain(MainFunctionParams parameters) {
16+
@@ -240,6 +240,10 @@ int GpuMain(MainFunctionParams parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
1818
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
1919

@@ -24,7 +24,7 @@ index 9f840287967b50ec1db3a9d27973429ab231a486..731a279e395a8762a25a115665bff99b
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -345,7 +349,6 @@ int GpuMain(MainFunctionParams parameters) {
27+
@@ -346,7 +350,6 @@ int GpuMain(MainFunctionParams parameters) {
2828
GpuProcess gpu_process(io_thread_priority);
2929
#endif
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
1010
context, which can cause some preload scripts to trip.
1111

1212
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
13-
index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749ef7409d77 100644
13+
index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93356b2862 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
16-
@@ -131,6 +131,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
16+
@@ -132,6 +132,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
1717
virtual void DidHandleOnloadEvents() {}
1818
virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
1919
int32_t world_id) {}
@@ -23,10 +23,10 @@ index d55a1b4f71224a2156eb5f3b0b32f41643b3dc28..f41c8f3d74f72d6e2220af527500749e
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763ea8bfed8e 100644
26+
index 448e5e6eab9e3bb98569a1d60619732173a396d2..88ba5eb82133a665cd5f9bdc52746c605c95509f 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4444,6 +4444,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4465,6 +4465,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index e0d4faf86b7afe7f29da5e5c8babc78a40e72ae1..1fbf6abed9c7d1bbec4478d022e1763e
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index 7be2fd1e02917537805a271f16f5f248f1c4fc45..ce0fc928448b597fb6401b77730700407ce406da 100644
43+
index d8ffccc148622d4eb0388e03c78ff1def4290701..5a3162cc88e5a48b04fbbb74a5c2ba4b7dd8a5d3 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -595,6 +595,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -599,6 +599,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
uint32_t ng_call_count) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -67,10 +67,10 @@ index 5adee94f81c0e98db976ac1c6c55fb5eab8c2e65..9d3e43f4394ad9a4377b47a001c4baf4
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
70-
index aa4b510137d60e6fb924f4f1a6554fe06c19ad75..816b6260020a6cbb6880b0eed197743ccd9002f5 100644
70+
index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b094153778e18b 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
73-
@@ -205,6 +205,7 @@ void LocalWindowProxy::Initialize() {
73+
@@ -207,6 +207,7 @@ void LocalWindowProxy::Initialize() {
7474
}
7575

7676
InstallConditionalFeatures();
@@ -110,10 +110,10 @@ index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
113-
index 6658e44e65f8236927f283e3f65f007ae97ac81f..f384dcc4efd6c56c3e3e212c7e597f13bc9dae57 100644
113+
index 420d82ed07017deba3298c5454666c09240dd23d..15407fb95dcf25875eb76a41fe1834c1f0a53528 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116-
@@ -79,6 +79,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
116+
@@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
117117

118118
void DidCreateScriptContext(v8::Local<v8::Context>,
119119
int32_t world_id) override;

‎patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
66
This allows us to disable throttling for hidden windows.
77

88
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
9-
index 8ee02135efb64c57d0779faa96640aa8e7775b58..66007d67da1230740eb00e31b220ddb02fbf37d9 100644
9+
index 32df5050f5a66c4b4f0981d3777a3b5a4fac9629..d8d9982bc6bd6e472677707b326a5dafa9b7fcf5 100644
1010
--- a/content/browser/renderer_host/render_view_host_impl.cc
1111
+++ b/content/browser/renderer_host/render_view_host_impl.cc
12-
@@ -650,6 +650,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
12+
@@ -660,6 +660,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
1313
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
1414
}
1515

@@ -48,10 +48,10 @@ index a6fe708878eb9afba9a68e0be71ba2c0b2a84d7d..5cc81ceb44d0a8baee3ebcc63aa4137b
4848
// This interface should only be implemented inside content.
4949
friend class RenderViewHostImpl;
5050
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
51-
index 4e8d36420d6edc1725a840e1b9f123041d21abe4..dd198cb7bf02e509833c6b4c7d8e5d65d20d46dc 100644
51+
index fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618f9bb6525 100644
5252
--- a/content/renderer/render_view_impl.h
5353
+++ b/content/renderer/render_view_impl.h
54-
@@ -152,6 +152,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
54+
@@ -151,6 +151,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
5555
static WindowOpenDisposition NavigationPolicyToDisposition(
5656
blink::WebNavigationPolicy policy);
5757

@@ -73,10 +73,10 @@ index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b
7373
+ SetSchedulerThrottling(bool allowed);
7474
};
7575
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
76-
index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033db89745c 100644
76+
index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919f8241393 100644
7777
--- a/third_party/blink/public/web/web_view.h
7878
+++ b/third_party/blink/public/web/web_view.h
79-
@@ -369,6 +369,7 @@ class WebView {
79+
@@ -364,6 +364,7 @@ class WebView {
8080
// Scheduling -----------------------------------------------------------
8181

8282
virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index 560b72dfbc70172bc668229b29fe0c9da139f320..13ec73b9d627259625d64f5b97838033
8585
// Visibility -----------------------------------------------------------
8686

8787
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
88-
index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504ccd6796979 100644
88+
index 0dc6c707cdbe14aec69f72575941c16a50ac2ce4..177e463358c3e8e94044f2ccc8eb2cf4a8ce7525 100644
8989
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
9090
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
91-
@@ -3669,6 +3669,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
91+
@@ -3693,6 +3693,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
9292
return GetPage()->GetPageScheduler();
9393
}
9494

@@ -102,7 +102,7 @@ index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504cc
102102
void WebViewImpl::SetVisibilityState(
103103
mojom::blink::PageVisibilityState visibility_state,
104104
bool is_initial_state) {
105-
@@ -3680,7 +3687,8 @@ void WebViewImpl::SetVisibilityState(
105+
@@ -3704,7 +3711,8 @@ void WebViewImpl::SetVisibilityState(
106106
}
107107
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
108108
GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,18 +113,18 @@ index dc63c0ba0cc8625ed5efb961a1c7f1d07fc72f5d..13a16ae577130d7520b47eb046b504cc
113113

114114
mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
115115
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
116-
index 5107ef421138e136b20b25b7bbcc1f0bb246bb66..043266205142e59f88c4c2f2ae6b58bb009f2d9c 100644
116+
index 08a54c62b7f4eeb6a8b0e0cb192723e1aecad915..1eeb122ac5db86c53d328a308dc2b7a4a5ca9fed 100644
117117
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
118118
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
119-
@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
119+
@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
120120
LocalDOMWindow* PagePopupWindow() const;
121121

122122
PageScheduler* Scheduler() const override;
123123
+ void SetSchedulerThrottling(bool allowed) override;
124124
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
125125
bool is_initial_state) override;
126126
mojom::blink::PageVisibilityState GetVisibilityState() override;
127-
@@ -857,6 +858,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
127+
@@ -854,6 +855,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
128128
// If true, we send IPC messages when |preferred_size_| changes.
129129
bool send_preferred_size_changes_ = false;
130130

0 commit comments

Comments
 (0)