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 112.0.5615.20 (24-x-y) (#37546)

Browse Source 
* chore: bump chromium in DEPS to 112.0.5615.20

* 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-03-13 15:39:53 +01:00
committed by GitHub
parent ddb4a16eb2
commit 238dfbaa0f
15 changed files with 62 additions and 62 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':
'112.0.5615.10',
'112.0.5615.20',
'node_version':
'v18.14.0',
'nan_version':

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -33,10 +33,10 @@ index 53363189fe649fa92040811ee9e858e9363f29e7..48883669d54ec7b7421b88fcaf7776e7
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b91b69e736d35522f2d1777ed270ab072c2c8ac3..3a6ea755d9736ae616c778d41c6561bd498d8c60 100644
index 1c8687da2f37a6669581f9a815b8de8fd6d3871c..61d0a5b1c3a92a1cff5ece23aee7bae10069337b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4583,7 +4583,7 @@ static_library("browser") {
@@ -4585,7 +4585,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 b91b69e736d35522f2d1777ed270ab072c2c8ac3..3a6ea755d9736ae616c778d41c6561bd
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index faa7b52a0ffa0df0461ea2cdfa3b0e888a571a82..fe8424ece6f848ce784ec5a63027f8bdfc916d8a 100644
index 2f23a386614d89c941cbf430fe637f61ae6f7301..145e6a680fc37e2fb16d9d5cf98034894866ef65 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6294,7 +6294,6 @@ test("unit_tests") {
@@ -6296,7 +6296,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@@ -57,7 +57,7 @@ index faa7b52a0ffa0df0461ea2cdfa3b0e888a571a82..fe8424ece6f848ce784ec5a63027f8bd
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6320,6 +6319,10 @@ test("unit_tests") {
@@ -6322,6 +6321,10 @@ test("unit_tests") {
"//ui/resources",
]
@@ -68,7 +68,7 @@ index faa7b52a0ffa0df0461ea2cdfa3b0e888a571a82..fe8424ece6f848ce784ec5a63027f8bd
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7236,7 +7239,7 @@ test("unit_tests") {
@@ -7238,7 +7241,7 @@ test("unit_tests") {
}
deps += [
@@ -77,7 +77,7 @@ index faa7b52a0ffa0df0461ea2cdfa3b0e888a571a82..fe8424ece6f848ce784ec5a63027f8bd
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
"//chrome/browser/enterprise/connectors/analysis:features",
@@ -7366,6 +7369,10 @@ test("unit_tests") {
@@ -7368,6 +7371,10 @@ test("unit_tests") {
}
}

20
patches/chromium/can_create_window.patch
View File

@@ -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 df857aa3509a1d7bbe451d3a1a4548fd06b5d06b..2aaf8071494a60dbece619ae29543963a763e81b 100644
index 435be1e6e1abba9e28dd7967db6968750c0bcdfd..75eda6e9d10092df37540b6fc61b30591398a062 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7600,6 +7600,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -7632,6 +7632,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,
@@ -21,10 +21,10 @@ index df857aa3509a1d7bbe451d3a1a4548fd06b5d06b..2aaf8071494a60dbece619ae29543963
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 39e8934e0d54b7c14df70fd464f9a2ad7ea2b63e..3e769c82ccac329c6e81132adfbe9c7c7ac26758 100644
index b04b88882583c2117621c917334d2a1445e09c5f..ae5da52cf66b83cea6322a4b3bb20367c74ae9bf 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4132,6 +4132,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4122,6 +4122,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get();
@@ -37,7 +37,7 @@ index 39e8934e0d54b7c14df70fd464f9a2ad7ea2b63e..3e769c82ccac329c6e81132adfbe9c7c
// 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
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4173,12 +4179,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4163,12 +4169,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@@ -100,10 +100,10 @@ index ceff9665cdb15dc796bca5f6810ab040678d4476..936758b16271dc2c366661ce163b51a9
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 53619a29db7ac34852fadf1574fdea8fe9f379eb..0d0af32724ff4cf2d8fd671aabe4c6c04c39a9ec 100644
index 885899b151520e0173a5ca68c2613b1333cadddf..5b53ee691c0a07ed1655139ca2d90341b5fa55a3 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -27,6 +27,17 @@ namespace content {
@@ -28,6 +28,17 @@ namespace content {
WebContentsDelegate::WebContentsDelegate() = default;
@@ -122,7 +122,7 @@ index 53619a29db7ac34852fadf1574fdea8fe9f379eb..0d0af32724ff4cf2d8fd671aabe4c6c0
const OpenURLParams& params) {
return nullptr;
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index b7325f818a2649f931abc0a5e508d6d2cd1db101..3c97a61d5747a1ca1cb7b81b5aa4f5d97f420fca 100644
index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696dc5460322 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -16,6 +16,7 @@
@@ -131,9 +131,9 @@ index b7325f818a2649f931abc0a5e508d6d2cd1db101..3c97a61d5747a1ca1cb7b81b5aa4f5d9
#include "content/common/content_export.h"
+#include "content/common/frame.mojom.h"
#include "content/public/browser/eye_dropper.h"
#include "content/public/browser/fullscreen_types.h"
#include "content/public/browser/invalidate_type.h"
#include "content/public/browser/media_stream_request.h"
@@ -342,6 +343,13 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -343,6 +344,13 @@ class CONTENT_EXPORT WebContentsDelegate {
const StoragePartitionConfig& partition_config,
SessionStorageNamespace* session_storage_namespace);

20
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -80,10 +80,10 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index f800d1439fd03555fa0f987d83060ddc19b97907..2f92092c9c6a21c6e3c9195abd2f0da282ca2496 100644
index 8e86697ca27eca507e5a95acbc3d68656532e59a..a11b0dbd0962e67cc5e90a6b7fefc86974ec5a1e 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1833,12 +1833,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1835,12 +1835,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -99,10 +99,10 @@ index f800d1439fd03555fa0f987d83060ddc19b97907..2f92092c9c6a21c6e3c9195abd2f0da2
WebContents* Browser::CreateCustomWebContents(
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 486cff37b13ac956f5510a01a7430305e81de951..2a96abb44a859db10a011a128d0d15e065b9de56 100644
index b8c8af5f2bace80d2fc470e80a1297c4664fc9e2..36e209b89462058b5f47f808d2d98757d2d1b63d 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -861,8 +861,7 @@ class Browser : public TabStripModelObserver,
@@ -862,8 +862,7 @@ class Browser : public TabStripModelObserver,
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -218,10 +218,10 @@ index 4e32d708ecf4afd3913d86ec1602ef2dc9a60998..1dd2f50fba1387b5eeb554dd540957d7
void AddNewContents(content::WebContents* source,
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
index e0487f98c353d16cdb1fdf3b4d6bfc49b98dc955..8ea4ae491d6b41a764a2ff1f32acebba7bd02054 100644
index 3b8dd5edb388b2c87fd38314c55bc649072ede69..a25a899bda3845b645ffdea2a622e3a3bddfdb4b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4035,8 +4035,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4025,8 +4025,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
@@ -232,10 +232,10 @@ index e0487f98c353d16cdb1fdf3b4d6bfc49b98dc955..8ea4ae491d6b41a764a2ff1f32acebba
static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
opener, source_site_instance, is_new_browsing_instance,
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 0d0af32724ff4cf2d8fd671aabe4c6c04c39a9ec..f60d625b735451c8119f974b4204a95ebdef748d 100644
index 5b53ee691c0a07ed1655139ca2d90341b5fa55a3..684b2f9c1f20a2dd460491d9d4285756907a8aa4 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -135,8 +135,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
@@ -136,8 +136,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
SiteInstance* source_site_instance,
mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -246,10 +246,10 @@ index 0d0af32724ff4cf2d8fd671aabe4c6c04c39a9ec..f60d625b735451c8119f974b4204a95e
}
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index 3c97a61d5747a1ca1cb7b81b5aa4f5d97f420fca..fb6553e63decd46b998f680d51666e1f0d8ff329 100644
index 76d699790fb7d92587293b14332f696dc5460322..2b15ee95474fab528fd710b52d3a1d9e6a60b871 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -321,8 +321,7 @@ class CONTENT_EXPORT WebContentsDelegate {
@@ -322,8 +322,7 @@ class CONTENT_EXPORT WebContentsDelegate {
SiteInstance* source_site_instance,
mojom::WindowContainerType window_container_type,
const GURL& opener_url,

2
patches/chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
View File

@@ -21,7 +21,7 @@ index e93fd69a9b6ceabd8c321f8b7ea641bb2f65f1c4..761584b86dc9d30c9bca018add9f1f8b
v8::ZoneBackingAllocator* GetZoneBackingAllocator() override;
#endif
diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc
index 1bbeeddd4ea35e0be46c5fac6a88be2a43508a30..81b76d95311b0674546bcfc5db75bfc7dcc59ce1 100644
index a1f4bb41a6dde8b3495996e486cea60a5ecf2b6c..3a3b76471a7ca9d73928a23d0e330daf9d9d399b 100644
--- a/gin/v8_platform.cc
+++ b/gin/v8_platform.cc
@@ -304,6 +304,10 @@ PageAllocator* V8Platform::GetPageAllocator() {

20
patches/chromium/fix_adapt_exclusive_access_for_electron_needs.patch
View File

@@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
change.
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479f0479c0d 100644
index c9d65125cee23ed0545608d6acde964f786d1b70..25ce25ed55c903af727e12e7bfdd86984c4273e4 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -16,12 +16,16 @@
@@ -34,9 +34,9 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#endif
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/fullscreen_types.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
@@ -179,10 +183,12 @@ void FullscreenController::EnterFullscreenModeForTab(
@@ -180,10 +184,12 @@ void FullscreenController::EnterFullscreenModeForTab(
return;
}
@@ -49,7 +49,7 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
// Keep the current state. |SetTabWithExclusiveAccess| may change the return
// value of |IsWindowFullscreenForTabOrPending|.
@@ -232,11 +238,13 @@ void FullscreenController::EnterFullscreenModeForTab(
@@ -233,11 +239,13 @@ void FullscreenController::EnterFullscreenModeForTab(
}
void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -63,7 +63,7 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
// During tab capture of fullscreen-within-tab views, the browser window
@@ -294,12 +302,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -295,12 +303,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
void FullscreenController::FullscreenTabOpeningPopup(
content::WebContents* opener,
content::WebContents* popup) {
@@ -78,7 +78,7 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
}
void FullscreenController::OnTabDeactivated(
@@ -475,18 +485,17 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -476,18 +486,17 @@ void FullscreenController::EnterFullscreenModeInternal(
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
// from manually entering fullscreen mode and also disables kiosk mode on
// desktop platforms.
@@ -102,7 +102,7 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
if (option == TAB) {
url = GetRequestingOrigin();
tab_fullscreen_ = true;
@@ -519,6 +528,7 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -520,6 +529,7 @@ void FullscreenController::EnterFullscreenModeInternal(
if (!extension_caused_fullscreen_.is_empty())
url = extension_caused_fullscreen_;
}
@@ -110,7 +110,7 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
if (option == BROWSER)
base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
@@ -540,12 +550,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
@@ -541,12 +551,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
RecordExitingUMA();
toggled_into_fullscreen_ = false;
started_fullscreen_transition_ = true;
@@ -127,10 +127,10 @@ index 0255e13e061293cd57de670b6a817b3e822dd8c5..e72c644e0adb9b447d60021d0e511479
extension_caused_fullscreen_ = GURL();
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
index 6502b3e023947e9f34cef246b233d984d2a02373..31d275e7d07848bc72c11553b0e0c891148fec56 100644
index 5ae306dd4e2d94f47b68098d6bdc84c3faca5d5d..99b45994c56d8a179c6b26ac2021b1285b618685 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
@@ -249,10 +249,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
@@ -245,10 +245,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
// Used in testing to set the state to tab fullscreen.
bool is_tab_fullscreen_for_testing_ = false;

4
patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
View File

@@ -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.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7fd2877e489606beb1debd160aac58bf65ac911a..0035a95fa95368aae3014cba5f1f8bdfcef0e119 100644
index a1c62f06eafb10c27756b6f9f933d593d4f6cf62..956d1b92e7f4b06880c2c4a877be164f90a844b1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3557,7 +3557,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -3547,7 +3547,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive());

10
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View File

@@ -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 a02a6e4a5eb91dfc4defe8befa1532edb39391db..787b4b5afcf9ee1075de1f86425228cfc6bd8993 100644
index 05de1c051b9c5942b93fb4f549c0bc6bc574d99e..854093bb0eb5b4d8f9f24e8e0e1aedeb99e09f4f 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -7026,10 +7026,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7055,10 +7055,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
if (IsForMhtmlSubframe())
return origin_with_debug_info;
@@ -37,10 +37,10 @@ index a02a6e4a5eb91dfc4defe8befa1532edb39391db..787b4b5afcf9ee1075de1f86425228cf
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index ea7f65bb16c9f71ba7930467a870428d1ff5ea6d..e83f4ecd45aaef79a2a6080c44c1fbe0de4915ea 100644
index 95dc8c6adb056ac2e58b60af6c6942e85a313915..00621eca392b508ab25d347291fd6d9a240564d0 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2828,6 +2828,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2840,6 +2840,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
// last committed document.
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
@@ -58,7 +58,7 @@ index ea7f65bb16c9f71ba7930467a870428d1ff5ea6d..e83f4ecd45aaef79a2a6080c44c1fbe0
protected:
friend class RenderFrameHostFactory;
@@ -3151,17 +3162,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -3163,17 +3174,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
// relevant.
void ResetWaitingState();

4
patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
View File

@@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 7f9149cfb6826aa1c2e97c2fbdf02dca4b26aa60..791ad56b1af2db78881483166b3fe0b494d68e29 100644
index c8373a0e8551b7d73fcfb15c09d527114ce9213b..ab03bf0a3ea7f660dfa8a53585e3f3fdffc5a785 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1866,7 +1866,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -1863,7 +1863,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
// IncrementCapturerCount() is destructed.
void DecrementCapturerCount(bool stay_hidden,
bool stay_awake,

4
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
View File

@@ -45,10 +45,10 @@ index 2ca4e42342ff6bf3f2ad104208944e36d572aa3c..7421cc779873b580d6f5a109d57ff744
// RenderFrameMetadataProvider::Observer implementation.
void OnRenderFrameMetadataChangedBeforeActivation(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0035a95fa95368aae3014cba5f1f8bdfcef0e119..39b4b2b0457d7ca19bf61d161eca9e7757c0892d 100644
index 956d1b92e7f4b06880c2c4a877be164f90a844b1..02802bb50b73900d67b2d56c455b954b5807d0e9 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8045,7 +8045,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -8037,7 +8037,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =

2
patches/chromium/mas_avoid_usage_of_private_macos_apis.patch
View File

@@ -142,7 +142,7 @@ index f860be6fbb6caf166f4808772a490ebba9cd7f08..d1b588346e106b032045b1a33ccc469c
std::vector<char*> argv_cstr;
argv_cstr.reserve(argv.size() + 1);
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index 5d90f7b2d46105d2626471bd812d5a45a04a945b..354b94225efab5b65b4f3874631bf8001ab58ce2 100644
index d820753ea56b4462df5578dc92d470e5473bb458..e5a83e88e08369b28f65707359b1eeae22f2827e 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -31,19 +31,23 @@

8
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -43,10 +43,10 @@ index 43981927fd7f9e02865abaeb117f08e5d8ad13e5..8435be99edbaf09e1c7835d7543f3975
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3e769c82ccac329c6e81132adfbe9c7c7ac26758..e0487f98c353d16cdb1fdf3b4d6bfc49b98dc955 100644
index ae5da52cf66b83cea6322a4b3bb20367c74ae9bf..3b8dd5edb388b2c87fd38314c55bc649072ede69 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4724,6 +4724,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4714,6 +4714,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@@ -59,10 +59,10 @@ index 3e769c82ccac329c6e81132adfbe9c7c7ac26758..e0487f98c353d16cdb1fdf3b4d6bfc49
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index c9093a271c675c77c1ea3cf4e2a3fcd3c256f76f..7f9149cfb6826aa1c2e97c2fbdf02dca4b26aa60 100644
index d266b5b70d02ea166762f54371845ac2588a4a47..c8373a0e8551b7d73fcfb15c09d527114ce9213b 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -967,6 +967,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -964,6 +964,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;

6
patches/chromium/web_contents.patch
View File

@@ -9,10 +9,10 @@ is needed for OSR.
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
index 8ea4ae491d6b41a764a2ff1f32acebba7bd02054..7fd2877e489606beb1debd160aac58bf65ac911a 100644
index a25a899bda3845b645ffdea2a622e3a3bddfdb4b..a1c62f06eafb10c27756b6f9f933d593d4f6cf62 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3175,6 +3175,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3165,6 +3165,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
@@ -26,7 +26,7 @@ index 8ea4ae491d6b41a764a2ff1f32acebba7bd02054..7fd2877e489606beb1debd160aac58bf
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3185,6 +3192,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3175,6 +3182,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}

4
patches/chromium/webview_fullscreen.patch
View File

@@ -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 2aaf8071494a60dbece619ae29543963a763e81b..2ebaab155d17663219b47dbd9ca7eec2baa239f5 100644
index 75eda6e9d10092df37540b6fc61b30591398a062..8e0e987ad951433f60ce9e9ab8f656bc3acf72aa 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6847,6 +6847,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6879,6 +6879,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}

4
patches/chromium/worker_context_will_destroy.patch
View File

@@ -67,10 +67,10 @@ index e2fb979da659c12b95b06492c147f3fe3f811dc7..fb71ffd54a677d56e92e191da3fac18b
const WebSecurityOrigin& script_origin) {
return false;
diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
index cb70abb76b6fbd3a8bbdc43f094f4c499ebf0bdb..f64344fccdb9c9c18da2e2832dee9524ba7a843a 100644
index 1073865e634bb5a435ec638a4abc14462e4b16cb..33408c339c21704c433377ed3c7462c7f4b0b8f3 100644
--- a/third_party/blink/renderer/core/workers/worker_thread.cc
+++ b/third_party/blink/renderer/core/workers/worker_thread.cc
@@ -751,6 +751,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
@@ -754,6 +754,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
}
pause_handle_.reset();