github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 116.0.5845.4 (26-x-y) (#38826)

Browse Source 
* chore: bump chromium in DEPS to 116.0.5845.3

* chore: bump chromium in DEPS to 116.0.5845.4

* Potential fix for flaky DesktopCaptureApiTest.Delegation unittest

https://chromium-review.googlesource.com/c/chromium/src/+/4632824

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot]
2023-06-26 15:07:07 -04:00
committed by GitHub
parent 76f4291130
commit 779a4e700d
3 changed files with 27 additions and 1 deletions
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':
'116.0.5845.0',
'116.0.5845.4',
'node_version':
'v18.16.0',
'nan_version':

1
patches/chromium/.patches
View File

@@ -128,3 +128,4 @@ fix_remove_profiles_from_spellcheck_service.patch
chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
chore_patch_out_profile_methods_in_titlebar_config.patch
fix_crash_on_nativetheme_change_during_context_menu_close.patch
potential_fix_for_flaky_desktopcaptureapitest_delegation_unittest.patch

25
patches/chromium/potential_fix_for_flaky_desktopcaptureapitest_delegation_unittest.patch Normal file
View File

@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: henrika <henrika@chromium.org>
Date: Thu, 22 Jun 2023 18:32:32 +0000
Subject: Potential fix for flaky DesktopCaptureApiTest.Delegation unittest
Bug: 1457052
Change-Id: I0b53347eafb60106a250d4fa1ca74a3c6862822e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4632824
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Henrik Andreasson <henrika@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1161343}
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index ef10371aa95ce930956975171077cccb6567e614..27687ee9f362c708af3e45d61effb20cebb413ae 100644
--- a/content/browser/media/capture/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -159,7 +159,7 @@ class ScopedHighResolutionTimer {
}
private:
- bool enabled_;
+ bool enabled_ = false;
#endif
};