Electron
/
electron
зеркало из https://github.com/electron/electron.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: bump chromium to 116.0.5833.0 (main) (#38809) 

* chore: bump chromium in DEPS to 116.0.5833.0

* chore: update patches

* 4530656: Add DeviceLoginScreenWebHidAllowDevicesForUrls policy

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

* Split CertDatabase notifications between trust changes and client cert changes

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

---------

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>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-06-15 16:37:01 -04:00 коммит произвёл GitHub
Родитель 46fb0d8f5f
Коммит 7219142a54
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
27 изменённых файлов: 59 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
DEPS
Просмотреть файл

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'116.0.5831.0',
'116.0.5833.0',
'node_version':
'v18.16.0',
'nan_version':

6
patches/chromium/add_electron_deps_to_license_credits_file.patch
Просмотреть файл

@ -7,10 +7,10 @@ Ensure that licenses for the dependencies introduced by Electron
are included in `LICENSES.chromium.html`
diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
index d775931a09f38db3eb472d095d461b50c5ef76f0..9d844edc8f7c2f526fa99804e8a072da1f47c656 100755
index 2a6a4733128dfc5916163c1c91c26f27da1d2f0a..f248f68e22d94b5762f0a64e0fe6804eef1d61d1 100755
--- a/tools/licenses/licenses.py
+++ b/tools/licenses/licenses.py
@@ -383,6 +383,31 @@ SPECIAL_CASES = {
@@ -413,6 +413,31 @@ SPECIAL_CASES = {
"License": "Apache 2.0",
"License File": "/third_party/selenium-atoms/LICENSE.closure",
},
@ -41,4 +41,4 @@ index d775931a09f38db3eb472d095d461b50c5ef76f0..9d844edc8f7c2f526fa99804e8a072da
+ },
}
# Special value for 'License File' field used to indicate that the license file
# Soon-to-be-deprecated special value for 'License File' field used to indicate

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
Просмотреть файл

@ -33,10 +33,10 @@ index 884bccba58c66861b43b3b50a7535cba543302e2..82e7bf534aa6b998cee8df53be3ca7db
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d96f137d79665af0eb895abacc3f88c147b6f0d4..70a8debfcbd7db29279c75d6a833f0d8aa93d7a1 100644
index 924e58a862e82b5940550f1c5bb5ec1940668d9b..014794f47aab13f1eb499e8046a93c89834d67e1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4591,7 +4591,7 @@ static_library("browser") {
@@ -4597,7 +4597,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@ -46,10 +46,10 @@ index d96f137d79665af0eb895abacc3f88c147b6f0d4..70a8debfcbd7db29279c75d6a833f0d8
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1ebec0043 100644
index 27943175303121dcd811295a8c8bc7b2c24cb806..669ff48e5291a1601938f7555ac89d9845582046 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6605,7 +6605,6 @@ test("unit_tests") {
@@ -6559,7 +6559,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6631,6 +6630,10 @@ test("unit_tests") {
@@ -6585,6 +6584,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7552,7 +7555,6 @@ test("unit_tests") {
@@ -7521,7 +7524,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
@@ -7638,6 +7640,10 @@ test("unit_tests") {
@@ -7607,6 +7609,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

12
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
Просмотреть файл

@ -6,7 +6,7 @@ Subject: build: only use the mas build config in the required components
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
diff --git a/base/BUILD.gn b/base/BUILD.gn
index ba907d51ea11537e83a6c7c813c13ec51da808c0..16933abf6878f3e31f3e29a77505b8c125b33b58 100644
index 0ab06651e6f02fe82edd0be862b61dff60e61190..014c196f31fbf760423cddf14551e6963418017d 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -228,6 +228,7 @@ if (is_apple) {
@ -128,7 +128,7 @@ index abf8aa4dcf498f9684c10fbbe85547040029401a..6a3897cb80071cf9cdd0ee035a7ade26
public_deps = [
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index d27590a1629161bf9f2e28c12bda4a78c95c194d..2e9c6979d0ebb17394d8c67fbc56df24801943bb 100644
index dea6e42fd43d95c92b6f066194527c0b015ec1e8..52d49c966735fbcf3326da0039dd3dd2b99142b1 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -477,6 +477,7 @@ static_library("test_support") {
@ -279,7 +279,7 @@ index e6a0ca42d0fa2446b300714372986da7e2013f16..fd651028ead9103dabcbb3686e412c12
if (is_apple) {
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 4fb4a862d285fababc67d4f2fe38036ea83bd8a9..fa71bc82342412d85fb05312b441cecbfd9da778 100644
index 082c6bc2bfbc546a80f4a21253ef9294cd4c6e14..2b1f97a1177dc39a8ea6026ae4add83c14380e84 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -67,6 +67,10 @@ component("display") {
@ -306,10 +306,10 @@ index ac1875a96d3d877a81b0f26c6a18036e0674c590..d4d74d3bee9be3735ca3245c8a9b0d06
if (is_win) {
sources += [
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 146d5428d9ab82da74a427ee9ac05258e23d681d..ba6b43d205145e3bae0f094ecdaa0cebda3e0a66 100644
index f4d38afeb09d013fd5c92296d782d53d29dbcd49..ff239357bc70c98d77d731a2e17606721511dde3 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -680,6 +680,7 @@ component("views") {
@@ -682,6 +682,7 @@ component("views") {
"IOSurface.framework",
"QuartzCore.framework",
]
@ -317,7 +317,7 @@ index 146d5428d9ab82da74a427ee9ac05258e23d681d..ba6b43d205145e3bae0f094ecdaa0ceb
}
if (is_win) {
@@ -1096,6 +1097,8 @@ source_set("test_support") {
@@ -1098,6 +1099,8 @@ source_set("test_support") {
"//testing/gtest",
]

4
patches/chromium/can_create_window.patch
Просмотреть файл

@ -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 b8fe56a4065dc105bf590ba66ad2d99e6b90cc65..47b8f449cb5c71382f6b27bb1fd57651bc8a1891 100644
index bef2d089de9efbc0e6921ec7806c725944de0841..c243e589938089b2c5cf56a0ec75fd161a4d7e76 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7825,6 +7825,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -7841,6 +7841,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,

6
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
Просмотреть файл

@ -102,10 +102,10 @@ index d4bb0e9a017a833b403916e1d6e64fb058f40f86..35ba35a95e39700824d6e0b480b99bc3
friend class ContentClientCreator;
friend class ContentClientInitializer;
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 5d97de5f7072054fdd57f0240c6faf0865013f3f..3c1d7f1aa7c55a5c2bd62cc85c7d17efb4311750 100644
index badac7434528c16159fecf8443d5553eb33934fa..d4828d70b6570215e6a29e464a55625fd4634b9b 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -526,8 +526,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
@@ -528,8 +528,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
@ -115,7 +115,7 @@ index 5d97de5f7072054fdd57f0240c6faf0865013f3f..3c1d7f1aa7c55a5c2bd62cc85c7d17ef
if (g_mapped_snapshot) {
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
// files in a process.
@@ -536,10 +535,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
@@ -538,10 +537,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
base::MemoryMappedFile::Region file_region;
base::File file =

8
patches/chromium/disable_color_correct_rendering.patch
Просмотреть файл

@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index cd6766a100d4cb29e373d2c86f9b544b2c430d10..0b44b813505779d6d10c855696587854fa327b7c 100644
index 36a155409de18e410dbd99f1985fcebb9a5849fa..583757474cab9f87abaa8a09f74765da4f03aea2 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1899,6 +1899,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@@ -1895,6 +1895,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
gfx::ContentColorUsage content_color_usage) const {
TargetColorParams params;
@ -93,10 +93,10 @@ index b7df289e4546fd5d33266223f4b678c1ab0e26e2..af4fdec439ebe630d43a60cfa53d3add
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index a8573d9c486d5c3b050af7fc896f31d56222b1a2..bc4e94f23a2fbe30857a2fa5b796f1f862fbf424 100644
index 19d712720b5eaf880c75eaaef897d814f4a5c35d..c8ad0f02d51d3340c8732ea8e349b3876be39601 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3518,6 +3518,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3517,6 +3517,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

2
patches/chromium/disable_hidden.patch
Просмотреть файл

@ -33,7 +33,7 @@ index e987d9316f9b5335a9c94a2dfe1f84498d9f704b..b0eb03c065753fe3bc8756d565fc17fb
protected:
// |routing_id| must not be MSG_ROUTING_NONE.
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 0e521106dda6bf6480e8c6a7fc6afda977e8ec08..9716c8f8a5fe15ffabe4eeedb7b5b35a57b61bac 100644
index c01cc787de463b8dc7afb633c939c5b7afbdf822..97840e12fee6f7b378d812d8906a780be52bdf90 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -606,7 +606,7 @@ void RenderWidgetHostViewAura::HideImpl() {

2
patches/chromium/feat_configure_launch_options_for_service_process.patch
Просмотреть файл

@ -183,7 +183,7 @@ index 01e62d7e8df65efb900e9cd0d34bcd8e0ed3e7da..9af6784707f125046d9a734165fc2b08
host->GetChildProcess()->BindServiceInterface(std::move(receiver));
}
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index cf3c0c18f582ea232eac24b517299e45a4d2f5f9..2f128d1fd1f7aa5e15adc3259f8275ceec1dd4b5 100644
index 4a5df7babed52c05f453a264d724dd2d89f7a0c6..3e11e84f5a42b3758ff0662eff249b6ad6ded77b 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -156,11 +156,13 @@ const ChildProcessData& UtilityProcessHost::GetData() {

4
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
Просмотреть файл

@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index be377b434ebf579962808a6b3ee377ea0e240734..56094608d0b7877f8b747e4262ec9db964885928 100644
index d7636277342f2ab015ecd22ffd470967b48cfc26..0a7c7005cd5d127ce293e89e639cda648de2a081 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -7323,10 +7323,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7332,10 +7332,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
if (IsForMhtmlSubframe())
return origin_with_debug_info;

6
patches/chromium/gin_enable_disable_v8_platform.patch
Просмотреть файл

@ -38,10 +38,10 @@ index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb2497
// Returns whether `Initialize` has already been invoked in the process.
// Initialization is a one-way operation (i.e., this method cannot return
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 39185f759db0398c36dbdc140eb27644516f6bcd..5d97de5f7072054fdd57f0240c6faf0865013f3f 100644
index c71893cb22e1a8cae65b798fa2995bcd8d41d7b0..badac7434528c16159fecf8443d5553eb33934fa 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -414,7 +414,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
@@ -416,7 +416,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
// static
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
const std::string js_command_line_flags,
@ -51,7 +51,7 @@ index 39185f759db0398c36dbdc140eb27644516f6bcd..5d97de5f7072054fdd57f0240c6faf08
static bool v8_is_initialized = false;
if (v8_is_initialized)
return;
@@ -424,7 +425,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -426,7 +427,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
// See https://crbug.com/v8/11043
SetFlags(mode, js_command_line_flags);

4
patches/chromium/gritsettings_resource_ids.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index b7fe3bcb125fa6d3a9169a380529bd001d071947..67c16dea3a99812b0950bd33d9ad8ded0dcc7ae9 100644
index bcc7aa7afbd8637a16b4f74a2149d7dc773b9d39..264773b0a47d888045ccb2b205bbfb8393b1c559 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1181,6 +1181,11 @@
@@ -1185,6 +1185,11 @@
"includes": [7440],
},

2
patches/chromium/gtk_visibility.patch
Просмотреть файл

@ -18,7 +18,7 @@ index 355067ea178bee1466f9df5a3ed146e9f09f0768..1b385d12692deece9e10722fc70215e8
# on GTK.
"//examples:peerconnection_client",
diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
index e537f1eb15458a7abfd68169c00215776325e2b9..efe6a94b36b49c79dcefc77ef4289592287ff57f 100644
index 76f399cd766add88d96499dd1c15ae841a2273da..bd0382b148fdadafcfb32a26fc3ddbfa265fa512 100644
--- a/ui/ozone/platform/x11/BUILD.gn
+++ b/ui/ozone/platform/x11/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")

2
patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
Просмотреть файл

@ -9,7 +9,7 @@ at rutime. It would be best if eventually all usages of this property were
replaced with clean ozone native implementations.
diff --git a/ui/ozone/platform/x11/ozone_platform_x11.cc b/ui/ozone/platform/x11/ozone_platform_x11.cc
index 807a8f82fd0d6bfd402a5f84b5a9849a0f56f7e9..b351d8d47322d56bb219ad05d19d42c441c4ae0a 100644
index 464421d46a5d764971bc010af6032e743147aa72..6815d2748a4ae70d107b14f8b65f07788ddb8330 100644
--- a/ui/ozone/platform/x11/ozone_platform_x11.cc
+++ b/ui/ozone/platform/x11/ozone_platform_x11.cc
@@ -192,6 +192,7 @@ class OzonePlatformX11 : public OzonePlatform,

2
patches/chromium/notification_provenance.patch
Просмотреть файл

@ -133,7 +133,7 @@ index bbd2aa78722fc0a14ac815ca0243b83965ad8d7c..b6e0a2fce3a0fb9c449aa1bef6a0f970
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f073addb3f1e92007e474baa8fa265b71d2874f8..b95fda20552eda765f680786f79c65dd9fc06ecb 100644
index 15dc38f75fd7f967bbc045c9b53b2d1f3d896ff9..2d77f10cfed48e316d4026eb57c085dc6c922f68 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2220,7 +2220,7 @@ void RenderProcessHostImpl::CreateNotificationService(

12
patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
Просмотреть файл

@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them. This patch can be
our autofill implementation to work like Chromium's.
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
index a8cc3f5c3db23081343c5530b1f37a78bae014bf..6a0173f1593341ef2f89613c8b99632a375b3746 100644
index 0a9045ddd0c02064ce2557cc8ff8c893713e1d80..eaa24c5e32bc1080481acb84be6df1515ee57915 100644
--- a/ui/color/color_id.h
+++ b/ui/color/color_id.h
@@ -368,6 +368,10 @@
@@ -373,6 +373,10 @@
E_CPONLY(kColorScrollbarThumbInactive) \
E_CPONLY(kColorScrollbarThumbPressed) \
E_CPONLY(kColorScrollbarTrack) \
@ -22,7 +22,7 @@ index a8cc3f5c3db23081343c5530b1f37a78bae014bf..6a0173f1593341ef2f89613c8b99632a
E_CPONLY(kColorSegmentedButtonBorder) \
E_CPONLY(kColorSegmentedButtonFocus) \
E_CPONLY(kColorSegmentedButtonForegroundChecked) \
@@ -455,6 +459,7 @@
@@ -460,6 +464,7 @@
E_CPONLY(kColorTreeNodeForeground) \
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
@ -31,10 +31,10 @@ index a8cc3f5c3db23081343c5530b1f37a78bae014bf..6a0173f1593341ef2f89613c8b99632a
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/ui/color/ui_color_mixer.cc b/ui/color/ui_color_mixer.cc
index 22fda2a88beb6d9495baf54b3d313fc13381dda0..d50d76000d7350c0ea42f24c9ade75ee29c8826f 100644
index 5f73cfc2dc8b80eb82e7793dee538cb6d03364bf..8378aa22e901e1f128cd9930aef6779bab979741 100644
--- a/ui/color/ui_color_mixer.cc
+++ b/ui/color/ui_color_mixer.cc
@@ -219,6 +219,17 @@ void AddUiColorMixer(ColorProvider* provider,
@@ -224,6 +224,17 @@ void AddUiColorMixer(ColorProvider* provider,
: SkColorSetA(SK_ColorBLACK, 0x80)};
mixer[kColorScrollbarTrack] = {dark_mode ? SkColorSetRGB(0x42, 0x42, 0x42)
: SkColorSetRGB(0xF1, 0xF1, 0xF1)};
@ -52,7 +52,7 @@ index 22fda2a88beb6d9495baf54b3d313fc13381dda0..d50d76000d7350c0ea42f24c9ade75ee
mixer[kColorSeparator] = {kColorMidground};
mixer[kColorShadowBase] = {dark_mode ? SK_ColorBLACK : gfx::kGoogleGrey800};
mixer[kColorShadowValueAmbientShadowElevationThree] =
@@ -317,6 +328,7 @@ void AddUiColorMixer(ColorProvider* provider,
@@ -322,6 +333,7 @@ void AddUiColorMixer(ColorProvider* provider,
mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
kColorTreeNodeForegroundSelectedFocused};

6
patches/chromium/printing.patch
Просмотреть файл

@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
This patch also fixes callback for manual user cancellation and success.
diff --git a/BUILD.gn b/BUILD.gn
index b8b5fddffbff56a83c6315b6d1aad2ad8fad0276..c4aed9336a783f4af3205b359eb5f09a8446e512 100644
index b512618d4ffefa76c50cf5c5cccd5f6516b99c28..c0e30639a7f36b1a7f6dcb040220ac79b64a7293 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -968,7 +968,6 @@ if (is_win) {
@@ -971,7 +971,6 @@ if (is_win) {
"//media:media_unittests",
"//media/midi:midi_unittests",
"//net:net_unittests",
@ -22,7 +22,7 @@ index b8b5fddffbff56a83c6315b6d1aad2ad8fad0276..c4aed9336a783f4af3205b359eb5f09a
"//sql:sql_unittests",
"//third_party/breakpad:symupload($host_toolchain)",
"//ui/base:ui_base_unittests",
@@ -977,6 +976,10 @@ if (is_win) {
@@ -980,6 +979,10 @@ if (is_win) {
"//ui/views:views_unittests",
"//url:url_unittests",
]

4
patches/chromium/render_widget_host_view_base.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
... something to do with OSR? and maybe <webview> as well? terrifying.
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index ed1488e08ccb1cb0c45a7ff5bb49bc5060462508..ad01511a8e44c4d6c4fb4a48cfbb7de36488f296 100644
index f522bf1f20a44973e35e57a7b94ecb33a75a68e4..dc0775b72c469c57510336842ca0dc807cbc9535 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -680,6 +680,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
@@ -679,6 +679,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
return false;
}

2
patches/chromium/support_mixed_sandbox_with_zygote.patch
Просмотреть файл

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b95fda20552eda765f680786f79c65dd9fc06ecb..a8573d9c486d5c3b050af7fc896f31d56222b1a2 100644
index 2d77f10cfed48e316d4026eb57c085dc6c922f68..19d712720b5eaf880c75eaaef897d814f4a5c35d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1905,9 +1905,15 @@ bool RenderProcessHostImpl::Init() {

2
patches/chromium/webview_cross_drag.patch
Просмотреть файл

@ -8,7 +8,7 @@ This allows dragging and dropping between <webview>s.
Originally landed in https://github.com/electron/libchromiumcontent/pull/267
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index dc348722b376370486c80da7ffaaa6ebf5250b33..1d7fe07c337024b66d68f2db400260158e143cc4 100644
index 18ad2b559dc7a19a75747f4a722b1df49f718990..5917786d2809860f2b1e6e302920e59e6e3b8414 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -919,10 +919,7 @@ bool WebContentsViewAura::IsValidDragTarget(

4
patches/chromium/webview_fullscreen.patch
Просмотреть файл

@ -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 47b8f449cb5c71382f6b27bb1fd57651bc8a1891..5685abb498c46e461db697dbe7abd65aa81e7e34 100644
index c243e589938089b2c5cf56a0ec75fd161a4d7e76..b6d401f3d3f8292eb5c1b90600823a922d5af609 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7046,6 +7046,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -7062,6 +7062,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}

6
patches/v8/build_gn.patch
Просмотреть файл

@ -9,7 +9,7 @@ necessary for native modules to load.
Also change visibility on mksnapshot in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index bba6e5665575e2f974a44d73279996d86ef7c94f..5bba6e30da5fb43940f10465faaf9b15636b808e 100644
index ac6227caf90fd1db380269f3bfbaaa4a81e97dd0..1e26045dc9bb0460ee3f007750e1cac443139511 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -715,7 +715,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index bba6e5665575e2f974a44d73279996d86ef7c94f..5bba6e30da5fb43940f10465faaf9b15
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -6539,7 +6539,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6540,7 +6540,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@ -30,7 +30,7 @@ index bba6e5665575e2f974a44d73279996d86ef7c94f..5bba6e30da5fb43940f10465faaf9b15
deps = [
":v8_libbase",
@@ -6551,7 +6551,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6552,7 +6552,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

2
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
Просмотреть файл

@ -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 5bba6e30da5fb43940f10465faaf9b15636b808e..f7160f2333c016c2cd9ead5aa66a9e971e139b97 100644
index 1e26045dc9bb0460ee3f007750e1cac443139511..120372ec9127da16c60e40c2c596988c01b5e187 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -715,6 +715,10 @@ config("internal_config") {

4
shell/browser/browser_process_impl.cc
Просмотреть файл

@ -293,10 +293,6 @@ SerialPolicyAllowedPorts* BrowserProcessImpl::serial_policy_allowed_ports() {
return nullptr;
}
HidPolicyAllowedDevices* BrowserProcessImpl::hid_policy_allowed_devices() {
return nullptr;
}
HidSystemTrayIcon* BrowserProcessImpl::hid_system_tray_icon() {
return nullptr;
}

1
shell/browser/browser_process_impl.h
Просмотреть файл

@ -97,7 +97,6 @@ class BrowserProcessImpl : public BrowserProcess {
override;
resource_coordinator::TabManager* GetTabManager() override;
SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
HidPolicyAllowedDevices* hid_policy_allowed_devices() override;
HidSystemTrayIcon* hid_system_tray_icon() override;
void CreateDevToolsProtocolHandler() override {}
void CreateDevToolsAutoOpener() override {}

2
shell/browser/ui/certificate_trust_mac.mm
Просмотреть файл

@ -74,7 +74,7 @@
auto* cert_db = net::CertDatabase::GetInstance();
// This forces Chromium to reload the certificate since it might be trusted
// now.
cert_db->NotifyObserversCertDBChanged();
cert_db->NotifyObserversTrustStoreChanged();
promise_->Resolve();
[self autorelease];

2
shell/browser/ui/certificate_trust_win.cc
Просмотреть файл

@ -33,7 +33,7 @@ BOOL AddToTrustedRootStore(const PCCERT_CONTEXT cert_context,
if (result) {
// force Chromium to reload it's database for this certificate
auto* cert_db = net::CertDatabase::GetInstance();
cert_db->NotifyObserversCertDBChanged();
cert_db->NotifyObserversTrustStoreChanged();
}
CertCloseStore(root_cert_store, CERT_CLOSE_STORE_FORCE_FLAG);