Skip to content

Commit b2235fe

Browse files
chore: bump chromium to 120.0.6099.5 (28-x-y) (electron#40420)
* chore: bump chromium in DEPS to 120.0.6099.5 * 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>
1 parent 5c70bd7 commit b2235fe

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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-
'120.0.6099.0',
5+
'120.0.6099.5',
66
'node_version':
77
'v18.18.0',
88
'nan_version':

patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ index e82717d5167e13e2926bcaf6c0ad66c1502e66f6..783c4d6ed399120e026bbf18baab4092
197197
const raw_ptr<GpuServiceImpl> gpu_service_impl_;
198198

199199
diff --git a/components/viz/service/display_embedder/software_output_device_mac.cc b/components/viz/service/display_embedder/software_output_device_mac.cc
200-
index 5dccc2360cd1f3d83ffc59697aeb559a19b0547a..5fe62069b15e6370e63645b257d931be2a714bc3 100644
200+
index 4ceb1a9d9f336f65e15831856d30b45af594dd0f..646ac22f074c3d1827e59170a93807bc10d83d0b 100644
201201
--- a/components/viz/service/display_embedder/software_output_device_mac.cc
202202
+++ b/components/viz/service/display_embedder/software_output_device_mac.cc
203203
@@ -106,6 +106,8 @@ void SoftwareOutputDeviceMac::UpdateAndCopyBufferDamage(
@@ -209,13 +209,13 @@ index 5dccc2360cd1f3d83ffc59697aeb559a19b0547a..5fe62069b15e6370e63645b257d931be
209209
// Record the previous paint buffer.
210210
Buffer* previous_paint_buffer =
211211
buffer_queue_.empty() ? nullptr : buffer_queue_.back().get();
212-
@@ -194,6 +196,7 @@ void SoftwareOutputDeviceMac::EndPaint() {
212+
@@ -191,6 +193,7 @@ void SoftwareOutputDeviceMac::EndPaint() {
213213
ca_layer_params.is_empty = false;
214214
ca_layer_params.scale_factor = scale_factor_;
215215
ca_layer_params.pixel_size = pixel_size_;
216216
+ ca_layer_params.damage = last_damage;
217217
ca_layer_params.io_surface_mach_port.reset(
218-
IOSurfaceCreateMachPort(current_paint_buffer_->io_surface.get()));
218+
IOSurfaceCreateMachPort(current_paint_buffer_->io_surface));
219219
client_->SoftwareDeviceUpdatedCALayerParams(ca_layer_params);
220220
diff --git a/components/viz/service/display_embedder/software_output_device_mac.h b/components/viz/service/display_embedder/software_output_device_mac.h
221221
index 67d5ff67d74c107a867b39b306c6528425b87e05..5fd12a25c9e319e8e675955926271c9d1cd3a7ca 100644

0 commit comments

Comments
 (0)