chore: bump chromium to 114.0.5694.0 (main) (#37820)

* chore: bump chromium in DEPS to 114.0.5694.0

* 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] 2023-04-04 15:42:56 +02:00 коммит произвёл GitHub
Родитель 3f42040a1b
Коммит 58f3c0ee37
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
25 изменённых файлов: 61 добавлений и 61 удалений

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

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = { vars = {
'chromium_version': 'chromium_version':
'114.0.5692.0', '114.0.5694.0',
'node_version': 'node_version':
'v18.15.0', 'v18.15.0',
'nan_version': 'nan_version':

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

@ -33,7 +33,7 @@ index 7c3a9357e6155e841215fd73ce9b71cbd688b676..04300a24bc1b3a6a0d326d177a4d9e07
"//base", "//base",
"//build:branding_buildflags", "//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 84e122d373f488296392dff31b4f5d9b27422558..4382eb6f6a91a55ba4053dc406c7c9178490a0bb 100644 index 44f71ea5d24fe1fc45d8bce83f1b9e5d62f9aec4..6024f883b60a5d52ac6e8f8c69e27d1a560ad459 100644
--- a/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4567,7 +4567,7 @@ static_library("browser") { @@ -4567,7 +4567,7 @@ static_library("browser") {
@ -46,10 +46,10 @@ index 84e122d373f488296392dff31b4f5d9b27422558..4382eb6f6a91a55ba4053dc406c7c917
sources += [ "certificate_viewer_stub.cc" ] sources += [ "certificate_viewer_stub.cc" ]
} }
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index b8f64317142678ae863deaeee8fbdbaa2f789746..2a6058597ea76095136fe1bcccb9e430c2293821 100644 index e26649fe6b687cf0039f11b325aa8b5729667c5e..7a4922a947091a55d256134083789f7a474a90da 100644
--- a/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -6383,7 +6383,6 @@ test("unit_tests") { @@ -6385,7 +6385,6 @@ test("unit_tests") {
deps += [ deps += [
"//chrome:other_version", "//chrome:other_version",
@ -57,7 +57,7 @@ index b8f64317142678ae863deaeee8fbdbaa2f789746..2a6058597ea76095136fe1bcccb9e430
"//chrome//services/util_win:unit_tests", "//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources", "//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests", "//chrome/app:win_unit_tests",
@@ -6409,6 +6408,10 @@ test("unit_tests") { @@ -6411,6 +6410,10 @@ test("unit_tests") {
"//ui/resources", "//ui/resources",
] ]
@ -68,7 +68,7 @@ index b8f64317142678ae863deaeee8fbdbaa2f789746..2a6058597ea76095136fe1bcccb9e430
ldflags = [ ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll", "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7335,7 +7338,6 @@ test("unit_tests") { @@ -7337,7 +7340,6 @@ test("unit_tests") {
} }
deps += [ deps += [
@ -76,7 +76,7 @@ index b8f64317142678ae863deaeee8fbdbaa2f789746..2a6058597ea76095136fe1bcccb9e430
"//chrome/browser/apps:icon_standardizer", "//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service", "//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support", "//chrome/browser/apps/app_service:test_support",
@@ -7413,6 +7415,10 @@ test("unit_tests") { @@ -7415,6 +7417,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings", "//ui/webui/resources/js/browser_command:mojo_bindings",
] ]

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

@ -6,10 +6,10 @@ 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 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 diff --git a/base/BUILD.gn b/base/BUILD.gn
index 704761e17ad8f4d9b8bbd1f15fa501c35dd2317a..171fd9bfd44c88d62684cda03a390d1d252c5bbe 100644 index 5c15cdf2ab2a8d41774917e6c006247ea9af44ab..b684afd5ef09fc220c042c44e5fcf7032e4bc92d 100644
--- a/base/BUILD.gn --- a/base/BUILD.gn
+++ b/base/BUILD.gn +++ b/base/BUILD.gn
@@ -1033,6 +1033,7 @@ component("base") { @@ -1036,6 +1036,7 @@ component("base") {
"//build/config/compiler:prevent_unsafe_narrowing", "//build/config/compiler:prevent_unsafe_narrowing",
"//build/config/compiler:wexit_time_destructors", "//build/config/compiler:wexit_time_destructors",
"//build/config/compiler:wglobal_constructors", "//build/config/compiler:wglobal_constructors",
@ -76,7 +76,7 @@ index 6926bd6766603f8de2237447c0a8fde2d09b67b4..707a943dd2bbc89917bd4b5b0fbc1d42
if (is_win) { if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 89ee70a94fde667db7f5ffd28fc0b08e59a8fd5b..bb09ca96d9db9b74e9f37f9cafc13e4b694af5a5 100644 index 3b1d9b1a41903d57e65517a046f30b11873b8b73..e231734571cadb6f5aebe49cf853c54f66d7fd8b 100644
--- a/content/browser/BUILD.gn --- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -56,6 +56,7 @@ source_set("browser") { @@ -56,6 +56,7 @@ source_set("browser") {
@ -265,10 +265,10 @@ index 00f83601160eb795067bce9532baeaa078259e68..37e40a1bcf770a060fe7803bafb08274
if (is_win) { if (is_win) {
sources += [ sources += [
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 0b2f14bbeabbb2f5f79940e3f5c4bf02a4b11c1f..8f9e95e56027920ebedc64a1ab24ca137f3e9127 100644 index 5aae27d937eb26f0b9f8bdf4f38a5fc48c930ab4..dc8da6198ebf689cf29adc5073c0d5f104535ab6 100644
--- a/ui/views/BUILD.gn --- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn
@@ -674,6 +674,7 @@ component("views") { @@ -675,6 +675,7 @@ component("views") {
"IOSurface.framework", "IOSurface.framework",
"QuartzCore.framework", "QuartzCore.framework",
] ]

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

@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken. 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 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 793b5e6a6ad85583bccd85a5652f27285ac3fe70..93e23efa3fab9cf8e5b8a5f08b4369a4295dda85 100644 index 814c7d68ef10f4b0978583ecb6983407b2d57ddf..79336d50231e352f83d3e06f35bacdfac0289f2a 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7677,6 +7677,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -7680,6 +7680,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type, last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(), params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features, params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index 793b5e6a6ad85583bccd85a5652f27285ac3fe70..93e23efa3fab9cf8e5b8a5f08b4369a4
&no_javascript_access); &no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b41d1cfe175de45f89d00757a89f858c2ec20301..6208f76554722394f34b70b1ebf0238cc476a15d 100644 index 336854b4fe339d7229f309d59984752ad95261cc..ac1fcc365e9bb093b4c45319f1d1f4cb2e79b818 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4147,6 +4147,12 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4156,6 +4156,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get(); auto* new_contents_impl = new_contents.get();
@ -37,7 +37,7 @@ index b41d1cfe175de45f89d00757a89f858c2ec20301..6208f76554722394f34b70b1ebf0238c
// If the new frame has a name, make sure any SiteInstances that can find // If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after // this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4188,12 +4194,6 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4197,12 +4203,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl); AddWebContentsDestructionObserver(new_contents_impl);
} }
@ -210,7 +210,7 @@ index 19e505a2d434dfd219b12304238e3b654eb8395f..314d1e63c55fae58e9f7ad0ce10045d3
} // namespace blink } // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 1d37b8101ba03673d0fa3b368efc9f514027939f..097dfc7c5e08e6d0254a1c33b3cce43e27caebd6 100644 index 6e4235ff40d88880e5928cbca2a593264d6da527..814781746df6fd0b2cedc2f3aa77759aa1c7a868 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2212,6 +2212,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, @@ -2212,6 +2212,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

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

@ -18,7 +18,7 @@ index f39533c8951d81fba73910a89b5cf2de9bd34a02..00756eb8a32aec3bc109db9aa1b370ab
/google_apis/internal /google_apis/internal
/googleurl /googleurl
diff --git a/third_party/.gitignore b/third_party/.gitignore diff --git a/third_party/.gitignore b/third_party/.gitignore
index 7d0f066d786fc0ca3b17c557a7089070e8c06d51..22a9d0bca1fc09d8dbd1ab0fbf30d421718c6367 100644 index 06405f8cf4ed0571d3df7a3d7a5370005d07c8bd..65c86fc3579ff2f828e5a356dbaffb847db7a795 100644
--- a/third_party/.gitignore --- a/third_party/.gitignore
+++ b/third_party/.gitignore +++ b/third_party/.gitignore
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@
@ -37,7 +37,7 @@ index 7d0f066d786fc0ca3b17c557a7089070e8c06d51..22a9d0bca1fc09d8dbd1ab0fbf30d421
/nasm /nasm
/nearby/src /nearby/src
/neon_2_sse/src /neon_2_sse/src
@@ -260,6 +262,7 @@ @@ -261,6 +263,7 @@
/speex /speex
/sqlite/src /sqlite/src
/sqlite4java/lib/ /sqlite4java/lib/

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

@ -80,7 +80,7 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685
} }
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f1e679d2db0f0f0b70c9be8d60d1351f48d44ad5..ebffc4b40e994d170380876130ec9182cf123fb3 100644 index 51b7658944d39151f5d11eec00650fcb87954e3c..45c002e75972acd3f3da84be7ced75253d403b7f 100644
--- a/chrome/browser/ui/browser.cc --- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -1837,12 +1837,11 @@ bool Browser::IsWebContentsCreationOverridden( @@ -1837,12 +1837,11 @@ bool Browser::IsWebContentsCreationOverridden(
@ -218,10 +218,10 @@ index 4e32d708ecf4afd3913d86ec1602ef2dc9a60998..1dd2f50fba1387b5eeb554dd540957d7
void AddNewContents(content::WebContents* source, void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents, std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 54e4c89b5aa91b55729ec520cb6fc5ff6c71ff0e..b51533132d4b317f13db889a3199cc35a75953ca 100644 index 1dafd9c9d934e19284279fb24e8488c086b20d4c..2fdbc714c3f0f560820eaec4524b016dea2fa442 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4054,8 +4054,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4063,8 +4063,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden( if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type, source_site_instance, params.window_container_type,

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

@ -93,10 +93,10 @@ index cb05dfa656174c132157a1ca283da2dad50c2423..fe38ee99ed053f41680a413883739cf7
sandbox::policy::switches::kGpuSandboxAllowSysVShm, sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal, 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 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f07a0fc51db35dab5b33015dd0be9a5745ed50dc..185712da863d2537489fcba6c30ab125bfe0d8cb 100644 index da3254d252dabca7593eb46c461ce4063137d957..cd0bd70cbefa80246fc4624a718585cf63c13e96 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3337,6 +3337,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( @@ -3333,6 +3333,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along // Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line. // with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = { static const char* const kSwitchNames[] = {

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

@ -33,10 +33,10 @@ index f4775ddc34202803b3b015dc565bdcf5d0f5d8e0..e33c5b8ea948523a91fee51f03651e10
protected: protected:
// |routing_id| must not be MSG_ROUTING_NONE. // |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 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 bc017ad27e37c4ea624d3659a374aaf55b96584a..8edae45df20b0a0fa02f41a0784f847c0492a5b4 100644 index c295b6c6bd54f6e537775ce7fbee2a256873cd60..b69ec986a4d8a96677d785cb6768f0c0d154ff2a 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() { @@ -607,7 +607,7 @@ void RenderWidgetHostViewAura::HideImpl() {
DCHECK(visibility_ == Visibility::HIDDEN || DCHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED); visibility_ == Visibility::OCCLUDED);

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

@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance. This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1ba9776faf55f6cf484682a81323890b657b1aa0..ecbfa477a3fa271286c8db0351af3daa4cab5315 100644 index f250dce2397f67cce8b5ef6000da69a782b159ff..4f802a4ef61778b4239d2b413fdeda7c15e589f0 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3575,7 +3575,7 @@ void WebContentsImpl::EnterFullscreenMode( @@ -3584,7 +3584,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode"); OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options)); DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive()); DCHECK(requesting_frame->IsActive());

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

@ -37,10 +37,10 @@ index bdfcdf4f7b3d22c94db220eec864a884b07f6c60..94a8ace08ab2cbc445030e7bac97d2ff
} }
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 442bacaa7c266361e2fba7f4ea41ea530cb904a9..25376e90c60da4bdfe04475f234b047bad24da83 100644 index f30708c035d815a7f1e184853c73a3e4be91f929..61e8e79df49ad881d5f20430a7d01031ea657e83 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h --- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2896,6 +2896,17 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -2901,6 +2901,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
// last committed document. // last committed document.
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo(); CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
@ -58,7 +58,7 @@ index 442bacaa7c266361e2fba7f4ea41ea530cb904a9..25376e90c60da4bdfe04475f234b047b
// Sets a ResourceCache in the renderer. `remote` must have the same process // Sets a ResourceCache in the renderer. `remote` must have the same process
// isolation policy. // isolation policy.
// TODO(https://crbug.com/1414262): Add checks to ensure the preconditions. // TODO(https://crbug.com/1414262): Add checks to ensure the preconditions.
@@ -3234,17 +3245,6 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -3241,17 +3252,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
// relevant. // relevant.
void ResetWaitingState(); void ResetWaitingState();

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

@ -6,7 +6,7 @@ Subject: fix: export zlib symbols
This patch sets ZLIB_DLL so that we properly export zlib symbols. This patch sets ZLIB_DLL so that we properly export zlib symbols.
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 5c215860aec16c1fdd15094b3af81b0eab94ea80..29883a2487b2e1bdc4742175dfec364a02ba233c 100644 index 0ffd486d731d8d2abeb1a4e215fe233d7ee6db2f..847565c1e5fa6e9e7aeab95268fc15e87a117d76 100644
--- a/third_party/zlib/BUILD.gn --- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn
@@ -326,6 +326,10 @@ component("zlib") { @@ -326,6 +326,10 @@ component("zlib") {

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

@ -45,10 +45,10 @@ index 2ca4e42342ff6bf3f2ad104208944e36d572aa3c..7421cc779873b580d6f5a109d57ff744
// RenderFrameMetadataProvider::Observer implementation. // RenderFrameMetadataProvider::Observer implementation.
void OnRenderFrameMetadataChangedBeforeActivation( void OnRenderFrameMetadataChangedBeforeActivation(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index ecbfa477a3fa271286c8db0351af3daa4cab5315..75731ad77adb9bb46c859d0bb3e364e49d9b056f 100644 index 4f802a4ef61778b4239d2b413fdeda7c15e589f0..096dd1e674c6141168ca18fb54ebdb4fbe601be7 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8081,7 +8081,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( @@ -8090,7 +8090,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame", "WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame); "render_frame_host", frame);
RenderWidgetHostViewBase* root_view = RenderWidgetHostViewBase* root_view =

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

@ -8,10 +8,10 @@ v8::Value instead of base::Value.
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=1323953 Refs https://bugs.chromium.org/p/chromium/issues/detail?id=1323953
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index 43fd5ef20228479f3090af0806df19baf65b963c..72062ab628af1eb3faac6337c4ce757c3e378d46 100644 index 6805d2d5638fa5dec698a4b674d70e6262301251..e76de2f29fa6718e79745bc5cede3c6cf858a325 100644
--- a/extensions/renderer/script_injection.cc --- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc +++ b/extensions/renderer/script_injection.cc
@@ -331,6 +331,7 @@ void ScriptInjection::InjectJs(std::set<std::string>* executing_scripts, @@ -273,6 +273,7 @@ void ScriptInjection::InjectJs(std::set<std::string>* executing_scripts,
blink::mojom::LoadEventBlockingOption::kBlock, blink::mojom::LoadEventBlockingOption::kBlock,
base::BindOnce(&ScriptInjection::OnJsInjectionCompleted, base::BindOnce(&ScriptInjection::OnJsInjectionCompleted,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),

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

@ -6,7 +6,7 @@ Subject: frame_host_manager.patch
Allows embedder to intercept site instances created by chromium. Allows embedder to intercept site instances created by chromium.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 5227d2f4a34bbf8ae34906f240f42b014b1f8c22..e9e6900d8a883a4dd12e42eaeb24a26bda261a1c 100644 index e66e0f659b693f86f0d7cc8751b82fd772e8fc17..e89bcb5c5c105d7dfceb84b0c3095af69ac21c15 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc --- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -3721,6 +3721,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( @@ -3721,6 +3721,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(

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

@ -66,7 +66,7 @@ index add9345fdd076698fc7ec654d7ef1701699639a4..ea5287cbe878014e4f0f6124a459bef2
} // namespace } // namespace
diff --git a/content/renderer/theme_helper_mac.mm b/content/renderer/theme_helper_mac.mm diff --git a/content/renderer/theme_helper_mac.mm b/content/renderer/theme_helper_mac.mm
index f50448237c40710e25644c2f7d44e8d0bc0789c8..752b575cf341546bdcc46e6dfff28fe4c66325b3 100644 index 2f77943c276b1fed8a35097132d7e03030247bed..e3c1641c570a0df2837b1a44826ab37e87ddac3a 100644
--- a/content/renderer/theme_helper_mac.mm --- a/content/renderer/theme_helper_mac.mm
+++ b/content/renderer/theme_helper_mac.mm +++ b/content/renderer/theme_helper_mac.mm
@@ -7,11 +7,11 @@ @@ -7,11 +7,11 @@
@ -82,8 +82,8 @@ index f50448237c40710e25644c2f7d44e8d0bc0789c8..752b575cf341546bdcc46e6dfff28fe4
+#endif +#endif
namespace content { namespace content {
void SystemColorsDidChange(int aqua_color_variant, void SystemColorsDidChange(int aqua_color_variant) {
@@ -59,8 +59,19 @@ void SystemColorsDidChange(int aqua_color_variant, @@ -32,8 +32,19 @@ void SystemColorsDidChange(int aqua_color_variant) {
bool IsSubpixelAntialiasingAvailable() { bool IsSubpixelAntialiasingAvailable() {
if (__builtin_available(macOS 10.14, *)) { if (__builtin_available(macOS 10.14, *)) {
// See https://trac.webkit.org/changeset/239306/webkit for more info. // See https://trac.webkit.org/changeset/239306/webkit for more info.

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

@ -133,7 +133,7 @@ index bbd2aa78722fc0a14ac815ca0243b83965ad8d7c..b6e0a2fce3a0fb9c449aa1bef6a0f970
const GURL& document_url, const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr, 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 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b642d389f443425429b6372c6311a38af3de7add..773d2d22cdaafc7c1988c06b88558fe2f545fcc3 100644 index 44fecf27a875f418de19390603899afdade42c26..cf277d96d0c0dc8381ceee8ea82b19e34291d652 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2122,7 +2122,7 @@ void RenderProcessHostImpl::CreateNotificationService( @@ -2122,7 +2122,7 @@ void RenderProcessHostImpl::CreateNotificationService(

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

@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
This patch also fixes callback for manual user cancellation and success. This patch also fixes callback for manual user cancellation and success.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index 7510795bd8138f7011f5d1d7fae8880126d86e22..67ca08de581453dbe557332a79db7f8b1c03b3f8 100644 index fb14019e74fa80a2d4479cdf04e99702d66591c7..4281492ef2eed313ce0500573fbbab37c0972575 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -980,7 +980,6 @@ if (is_win) { @@ -978,7 +978,6 @@ if (is_win) {
"//media:media_unittests", "//media:media_unittests",
"//media/midi:midi_unittests", "//media/midi:midi_unittests",
"//net:net_unittests", "//net:net_unittests",
@ -22,7 +22,7 @@ index 7510795bd8138f7011f5d1d7fae8880126d86e22..67ca08de581453dbe557332a79db7f8b
"//sql:sql_unittests", "//sql:sql_unittests",
"//third_party/breakpad:symupload($host_toolchain)", "//third_party/breakpad:symupload($host_toolchain)",
"//ui/base:ui_base_unittests", "//ui/base:ui_base_unittests",
@@ -989,6 +988,10 @@ if (is_win) { @@ -987,6 +986,10 @@ if (is_win) {
"//ui/views:views_unittests", "//ui/views:views_unittests",
"//url:url_unittests", "//url:url_unittests",
] ]
@ -818,10 +818,10 @@ index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document. // Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index feaef291f76698dcd7354399c7649c7b6565e37e..89ee70a94fde667db7f5ffd28fc0b08e59a8fd5b 100644 index 0acd4095c9fefff8b00f1a1c889eafa3c6807c12..3b1d9b1a41903d57e65517a046f30b11873b8b73 100644
--- a/content/browser/BUILD.gn --- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -2848,8 +2848,9 @@ source_set("browser") { @@ -2850,8 +2850,9 @@ source_set("browser") {
"//ppapi/shared_impl", "//ppapi/shared_impl",
] ]

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

@ -43,10 +43,10 @@ index d164a86023ceb2718dfefce23d0a9fc910150f0e..a6c12048023a42192894f46efd90ff19
void RenderWidgetHostImpl::ShowContextMenuAtPoint( void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6208f76554722394f34b70b1ebf0238cc476a15d..54e4c89b5aa91b55729ec520cb6fc5ff6c71ff0e 100644 index ac1fcc365e9bb093b4c45319f1d1f4cb2e79b818..1dafd9c9d934e19284279fb24e8488c086b20d4c 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4739,6 +4739,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() { @@ -4748,6 +4748,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get(); return text_input_manager_.get();
} }

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

@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work. Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 5b9d06fabd2bbc756e2956011fce50edf9a3649e..ccfbd090a993fc324fa3545ff7dc0fcb72eadff9 100644 index d0aa0090e0d6304d6e8afa70710520b8e4930f25..9d42b0a8d3b1f2660673ec0a6e0c8de184d64c84 100644
--- a/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -1342,7 +1342,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { @@ -1344,7 +1344,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
} }
bool RenderThreadImpl::IsElasticOverscrollEnabled() { bool RenderThreadImpl::IsElasticOverscrollEnabled() {

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

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class. 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 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 773d2d22cdaafc7c1988c06b88558fe2f545fcc3..f07a0fc51db35dab5b33015dd0be9a5745ed50dc 100644 index cf277d96d0c0dc8381ceee8ea82b19e34291d652..da3254d252dabca7593eb46c461ce4063137d957 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1803,9 +1803,15 @@ bool RenderProcessHostImpl::Init() { @@ -1803,9 +1803,15 @@ bool RenderProcessHostImpl::Init() {

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

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226. Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b51533132d4b317f13db889a3199cc35a75953ca..1ba9776faf55f6cf484682a81323890b657b1aa0 100644 index 2fdbc714c3f0f560820eaec4524b016dea2fa442..f250dce2397f67cce8b5ef6000da69a782b159ff 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3193,6 +3193,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3202,6 +3202,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy, params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create()); base::UnguessableToken::Create());
@ -26,7 +26,7 @@ index b51533132d4b317f13db889a3199cc35a75953ca..1ba9776faf55f6cf484682a81323890b
std::unique_ptr<WebContentsViewDelegate> delegate = std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3203,6 +3210,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3212,6 +3219,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate), view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }

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

@ -14,7 +14,7 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value. `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 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 93e23efa3fab9cf8e5b8a5f08b4369a4295dda85..cfb5bb7cc2eae044860c48940250e5bb414fda30 100644 index 79336d50231e352f83d3e06f35bacdfac0289f2a..150f03df689d44d627fbe8366bc997a5cdfedba5 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc --- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6911,6 +6911,17 @@ void RenderFrameHostImpl::EnterFullscreen( @@ -6911,6 +6911,17 @@ void RenderFrameHostImpl::EnterFullscreen(

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

@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM. Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index 308efaa7594b2665afe71d360c4a8612dc3ed7e5..a246a739754972b518a720b6fdf92a3d806a6612 100644 index 85945116f290306e64b123be618ba8c4daf0ccf5..cedc35c82c88afde901355eba3719f30790bb398 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -699,7 +699,7 @@ config("internal_config") { @@ -699,7 +699,7 @@ config("internal_config") {
@ -21,7 +21,7 @@ index 308efaa7594b2665afe71d360c4a8612dc3ed7e5..a246a739754972b518a720b6fdf92a3d
defines += [ "BUILDING_V8_SHARED" ] defines += [ "BUILDING_V8_SHARED" ]
} }
@@ -6410,7 +6410,7 @@ if (current_toolchain == v8_generator_toolchain) { @@ -6411,7 +6411,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h", "src/interpreter/bytecodes.h",
] ]

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

@ -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`). contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index cafdcf441c1ddfeda5b23c453dcd6ed042534d63..01e8e368571f4f6b5106fab2268d149327d335cd 100644 index 8662429ee167e514d3b47a302a171b9c4ab57aee..9b7255e56137dc1eee6c7c54b69e7324ae6fec0a 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -699,6 +699,10 @@ config("internal_config") { @@ -699,6 +699,10 @@ config("internal_config") {

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

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip. Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index a246a739754972b518a720b6fdf92a3d806a6612..cafdcf441c1ddfeda5b23c453dcd6ed042534d63 100644 index cedc35c82c88afde901355eba3719f30790bb398..8662429ee167e514d3b47a302a171b9c4ab57aee 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -6422,7 +6422,6 @@ if (current_toolchain == v8_generator_toolchain) { @@ -6423,7 +6423,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) { if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") { v8_executable("mksnapshot") {