mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: bump chromium to 116.0.5831.0 (main) (#38784)

Browse source 
* chore: bump chromium in DEPS to 116.0.5831.0

* chore: update patches

---------

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-14 16:59:54 -04:00 committed by GitHub
parent 30579859c4
commit bb4e9b27b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 63 additions and 63 deletions
Show stats 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.5829.0',
'116.0.5831.0',
'node_version':
'v18.16.0',
'nan_version':

4
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -23,10 +23,10 @@ index 103a9d9fb17e954ecaf0acecaa3eeafc23e39c94..de299316216dba204decba3b0eb57f5c
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 797ebc2b7aa045bcf9e032b3ebae28a3fc8d2403..f3d5f0b36a2484b1959e26ff170836750c4d4c3e 100644
index bbe58fc8970ba61489e3d2e6d0a31b00f768c011..7a26dfa0207573316b6397b13b4a58e4408ae8e1 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4419,6 +4419,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4430,6 +4430,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

6
patches/chromium/blink_local_frame.patch
View file

@ -49,10 +49,10 @@ index 22c4d4e9718a503d9c7ca26a40c97149b0f8986a..6bdc2757c96a28022fda9e6f5e3b74a0
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index e3cdbd21494ca8dafef40ef1e2561eb2dc36ef15..10c969ab87be91f01b5ea5aca267a22551df621e 100644
index f57d2b2705b456273ff8fc8d8246e012e73d4175..19d253696c57f957e9f564c5f8366f39ef1ae349 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -638,10 +638,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -664,10 +664,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());
@ -63,7 +63,7 @@ index e3cdbd21494ca8dafef40ef1e2561eb2dc36ef15..10c969ab87be91f01b5ea5aca267a225
if (!Client())
return false;
@@ -689,6 +685,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -715,6 +711,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();

14
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -33,10 +33,10 @@ index 884bccba58c66861b43b3b50a7535cba543302e2..82e7bf534aa6b998cee8df53be3ca7db
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index e89c9c045dd0dad908d2f1cbea8e329f58b6528c..a87b3b75f355ae577df20bd34cd012bcc3e9e11f 100644
index d96f137d79665af0eb895abacc3f88c147b6f0d4..70a8debfcbd7db29279c75d6a833f0d8aa93d7a1 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4590,7 +4590,7 @@ static_library("browser") {
@@ -4591,7 +4591,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 e89c9c045dd0dad908d2f1cbea8e329f58b6528c..a87b3b75f355ae577df20bd34cd012bc
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 0ccf6947c9fd1aa76cb2d1eedf1c4936318d2851..6f9ec7930884b53cf05c33e143ba4096888a822e 100644
index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1ebec0043 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6634,7 +6634,6 @@ test("unit_tests") {
@@ -6605,7 +6605,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index 0ccf6947c9fd1aa76cb2d1eedf1c4936318d2851..6f9ec7930884b53cf05c33e143ba4096
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6660,6 +6659,10 @@ test("unit_tests") {
@@ -6631,6 +6630,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index 0ccf6947c9fd1aa76cb2d1eedf1c4936318d2851..6f9ec7930884b53cf05c33e143ba4096
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7587,7 +7590,6 @@ test("unit_tests") {
@@ -7552,7 +7555,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index 0ccf6947c9fd1aa76cb2d1eedf1c4936318d2851..6f9ec7930884b53cf05c33e143ba4096
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
@@ -7673,6 +7675,10 @@ test("unit_tests") {
@@ -7638,6 +7640,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

16
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
View file

@ -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 83cdc61ae5ac4b98fc1d68ad99672606c75ddd09..0ca6f56c642f7874d1acdf6aae94a5e090d94afd 100644
index ba907d51ea11537e83a6c7c813c13ec51da808c0..16933abf6878f3e31f3e29a77505b8c125b33b58 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -228,6 +228,7 @@ if (is_apple) {
@ -92,7 +92,7 @@ index 4793d5bc9de9a3a158f90e0432c32c4818bcef2e..c42793c782c13a62b6205d0ed555ad5a
if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 3177185f3adfd2bbb6ca6c6c8fdabde4cb90e839..7ccb4ecd7c9d9fb4106e15812f191b65eb8c03ac 100644
index e6125b6af20434f3ec3171c044d515b8c120a7b5..1e2ccffbe25e5149a8e5c8174f75119014386f57 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -56,6 +56,7 @@ source_set("browser") {
@ -128,7 +128,7 @@ index abf8aa4dcf498f9684c10fbbe85547040029401a..6a3897cb80071cf9cdd0ee035a7ade26
public_deps = [
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 6709d1b96a1a92142f257911eaf546aa4954e935..e9d5318bceb63fe91811f4e04570bfc0efa23760 100644
index d27590a1629161bf9f2e28c12bda4a78c95c194d..2e9c6979d0ebb17394d8c67fbc56df24801943bb 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -477,6 +477,7 @@ static_library("test_support") {
@ -153,13 +153,13 @@ index 9d47887dd255187ffe49f5d9dbd01aff5b1de15e..7cde88462e0fc57f9f19badbf1042153
configs += [ "//build/config/compiler:enable_arc" ]
}
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 642afd72cc0f98fe2590cef0c470f378eabb939e..894769a5de698767117339cab0fc2942d1a20b90 100644
index 52940b9bc43aa96dc0a7f90e63ec123ca41c5fab..7c71b07ca2d4b1418b305e876b6be51921b3ea66 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -240,6 +240,7 @@ component("bluetooth") {
"IOKit.framework",
@@ -241,6 +241,7 @@ component("bluetooth") {
"Foundation.framework",
]
configs += [ "//build/config/compiler:enable_arc" ]
+ configs += ["//electron/build/config:mas_build"]
}
@ -230,7 +230,7 @@ index 5e9fc18352d1bf0939f8366d2282b49aeb307994..69dcc2cafa27b3d8bdf3fe8d0a22a980
source_set("sandbox_unittests") {
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
index db6a4b6a75ed36008128dbcadbe99397483d9566..1910ace5b6acc27c8c215a0f481ac8a6b327ac06 100644
index ea98141f7cf3c4fcacfd82061963129b5d66bfa4..7ec5889a61e5575936a31196270333d39dcb6154 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -308,6 +308,7 @@ component("core") {
@ -267,7 +267,7 @@ index cb282e3a526fb724b25c0d4c6a2af3da30ee0a20..d4275f68211f5a0cddfd2bcbc0f620e8
if (use_atk) {
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 4de874f3d12be434ea7f7f9737077a37cd11dc4c..78281df1de98e25a3d73471fc2f57699cf48e5d4 100644
index e6a0ca42d0fa2446b300714372986da7e2013f16..fd651028ead9103dabcbb3686e412c12ba8e7952 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -355,6 +355,7 @@ component("base") {

12
patches/chromium/can_create_window.patch
View file

@ -9,7 +9,7 @@ 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 f20506297fc2629c186aa780b0f1ff6f74fdd90e..055b0bd53fea17e1df96f460aede20497d53216f 100644
index b8fe56a4065dc105bf590ba66ad2d99e6b90cc65..47b8f449cb5c71382f6b27bb1fd57651bc8a1891 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(
@ -21,10 +21,10 @@ index f20506297fc2629c186aa780b0f1ff6f74fdd90e..055b0bd53fea17e1df96f460aede2049
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0a2c7372e7931e4e7b0a88c6e3ae94f4f96f7d99..fdd0eacf647dd9097bdb59ff408fcd46e078dd72 100644
index 7d7a63537601d6b5cb1a952cc6404c40c59da527..75d6d7b62778fc00bb9b131e11eaef0431abcb29 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4176,6 +4176,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4216,6 +4216,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get();
@ -37,7 +37,7 @@ index 0a2c7372e7931e4e7b0a88c6e3ae94f4f96f7d99..fdd0eacf647dd9097bdb59ff408fcd46
// 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
@@ -4217,12 +4223,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4257,12 +4263,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@ -148,10 +148,10 @@ index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696d
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c7b69423df941f2407b96a49ff6012cc22838dc2..797ebc2b7aa045bcf9e032b3ebae28a3fc8d2403 100644
index c493bb95b63d2d0810bfe50747e75dbbb0e4319c..bbe58fc8970ba61489e3d2e6d0a31b00f768c011 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6297,6 +6297,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -6308,6 +6308,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
blink::GetNavigationInitiatorActivationAndAdStatus(
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());

4
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -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 020dc08a3d8a83fe1f82e3f3ae65f2a18bd4935b..ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d 100644
index 0b9b22ed11db2aaa5cb4290370aa38bf739e415d..5a8b34ea90f32e12bd75c6b5318c743096e9694c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4083,8 +4083,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4123,8 +4123,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,

2
patches/chromium/disable_color_correct_rendering.patch
View file

@ -20,7 +20,7 @@ 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 943e3217f5327934ad27d1d7b7b2f664c2eb85ef..3dd1abc9a50a96fa7a7ce128486c7ba2e2187e12 100644
index cd6766a100d4cb29e373d2c86f9b544b2c430d10..0b44b813505779d6d10c855696587854fa327b7c 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1899,6 +1899,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(

4
patches/chromium/disable_hidden.patch
View file

@ -33,10 +33,10 @@ 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 a122bd2170bbb543641454d39789d7f5f0500fc3..3d87288585c03cc9f7bb257823ff7359049d88ee 100644
index 0e521106dda6bf6480e8c6a7fc6afda977e8ec08..9716c8f8a5fe15ffabe4eeedb7b5b35a57b61bac 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -607,7 +607,7 @@ void RenderWidgetHostViewAura::HideImpl() {
@@ -606,7 +606,7 @@ void RenderWidgetHostViewAura::HideImpl() {
DCHECK(visibility_ == Visibility::HIDDEN ||
visibility_ == Visibility::OCCLUDED);

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 fbae94d817d600df09052da88180d1e2a83361fa..275c0c903cce8dbc5936452930184047d257b5f0 100644
index e1c1c39119d5b0fde1cc0d3649810309f2517ea2..05374c40064a61da0bf3a77abc3bf66cc0479b27 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3603,7 +3603,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -3643,7 +3643,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive());

6
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -37,10 +37,10 @@ index be377b434ebf579962808a6b3ee377ea0e240734..56094608d0b7877f8b747e4262ec9db9
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 09ddb217948bde74dff56d1ab030f1ccc6fd77a8..778520d167229a8278657bcede2798eb6e04a6e3 100644
index 2a287fb5dd411574305d5d0d14de78cca03e0bab..62f4f9bc96d134f63bbad33da3ae40b4f8f5f403 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2915,6 +2915,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2921,6 +2921,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
// last committed document.
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
@ -58,7 +58,7 @@ index 09ddb217948bde74dff56d1ab030f1ccc6fd77a8..778520d167229a8278657bcede2798eb
// Sets a ResourceCache in the renderer. `this` must be active and there must
// be no pending navigation. `remote` must have the same and process
// isolation policy.
@@ -3288,17 +3299,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -3294,17 +3305,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
// relevant.
void ResetWaitingState();

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

@ -45,10 +45,10 @@ index ed0641b888c6421b1791c086466bd9c158e9109d..3760b3823d5af3325017bb53f5b1d38e
// 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 275c0c903cce8dbc5936452930184047d257b5f0..e01bcb9f5c715cd03dcce6f3ca3bd532b8062a75 100644
index 05374c40064a61da0bf3a77abc3bf66cc0479b27..d78c91a21dc0044a2f92dfcd04f3bbf0c1f68d0f 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8123,7 +8123,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -8163,7 +8163,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =

6
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
View file

@ -64,10 +64,10 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 10c969ab87be91f01b5ea5aca267a22551df621e..4f8e09278c176fbd55e61fbf32ce60e492d6b0e1 100644
index 19d253696c57f957e9f564c5f8366f39ef1ae349..26cea0bbf8ca0bacc414ac92d6b83a73d9ae7a69 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -2712,6 +2712,7 @@ void LocalFrame::RequestExecuteScript(
@@ -2744,6 +2744,7 @@ void LocalFrame::RequestExecuteScript(
mojom::blink::EvaluationTiming evaluation_timing,
mojom::blink::LoadEventBlockingOption blocking_option,
WebScriptExecutionCallback callback,
@ -75,7 +75,7 @@ index 10c969ab87be91f01b5ea5aca267a22551df621e..4f8e09278c176fbd55e61fbf32ce60e4
BackForwardCacheAware back_forward_cache_aware,
mojom::blink::WantResultOption want_result_option,
mojom::blink::PromiseResultOption promise_behavior) {
@@ -2742,7 +2743,8 @@ void LocalFrame::RequestExecuteScript(
@@ -2774,7 +2775,8 @@ void LocalFrame::RequestExecuteScript(
PausableScriptExecutor::CreateAndRun(
ToScriptState(DomWindow(), *world), std::move(script_sources),
execute_script_policy, user_gesture, evaluation_timing, blocking_option,

2
patches/chromium/mas_disable_remote_accessibility.patch
View file

@ -214,7 +214,7 @@ index 1ae5b54369158da65d552f3c848e0f3c805b0f5c..e15e6b3e145aecfddd1ce20fdd6c844b
///////////////////////////////////////////////////////////////////////////////
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 6f4679b7ecef47a0f1fd16b5772dd7bf84d0549c..4de874f3d12be434ea7f7f9737077a37cd11dc4c 100644
index f85c1f22203a7f8a9dd7e7844ab022ed5efc2dc1..e6a0ca42d0fa2446b300714372986da7e2013f16 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -372,6 +372,13 @@ component("base") {

14
patches/chromium/mas_no_private_api.patch
View file

@ -103,18 +103,18 @@ index 55ef23bac1acd703d4e29a4418d85676f8b56be3..42bd5787bfc77dac3e309f1075325368
}
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
index 2c5387fbdcac4b33df770fcd37b050121d0b9b38..a4c2867b4bb6c2c2dcd6565873ccccd940712449 100644
index 79bf09102ab4ca9b0a5830132d98b7bd844b1c26..e2b20c0cda169d7b4af5c05b8797188955df8e3c 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -37,6 +37,7 @@
#include "device/bluetooth/bluetooth_socket_mac.h"
#include "device/bluetooth/public/cpp/bluetooth_address.h"
@@ -41,6 +41,7 @@
#error "This file requires ARC support."
#endif
+#if !IS_MAS_BUILD()
extern "C" {
// Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
// `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
@@ -50,6 +51,7 @@
@@ -54,6 +55,7 @@
// [4] https://support.apple.com/kb/PH25091
void IOBluetoothPreferenceSetControllerPowerState(int state);
}
@ -122,7 +122,7 @@ index 2c5387fbdcac4b33df770fcd37b050121d0b9b38..a4c2867b4bb6c2c2dcd6565873ccccd9
namespace {
@@ -93,8 +95,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
@@ -97,8 +99,10 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
: controller_state_function_(
base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
base::Unretained(this))),
@ -133,7 +133,7 @@ index 2c5387fbdcac4b33df770fcd37b050121d0b9b38..a4c2867b4bb6c2c2dcd6565873ccccd9
classic_discovery_manager_(
BluetoothDiscoveryManagerMac::CreateClassic(this)),
device_paired_status_callback_(
@@ -249,8 +253,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
@@ -253,8 +257,12 @@ bool IsDeviceSystemPaired(const std::string& device_address) {
}
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {

4
patches/chromium/printing.patch
View file

@ -11,7 +11,7 @@ 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 85f6428008b8710d6af5008a95a84d346d14c185..73a1756e723ef24e49b8893f1336f78e099765c5 100644
index b8b5fddffbff56a83c6315b6d1aad2ad8fad0276..c4aed9336a783f4af3205b359eb5f09a8446e512 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -968,7 +968,6 @@ if (is_win) {
@ -847,7 +847,7 @@ index d971e446859507456da153a9d59f3ed4857b66cb..9ab75731a941e7065dfaa481508cfa47
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index e4e7240043050b3ca74645c52e021ee75019afc2..3177185f3adfd2bbb6ca6c6c8fdabde4cb90e839 100644
index cc47fb1a2a3d6a6fe15448ebdba25c29b4b88aa0..e6125b6af20434f3ec3171c044d515b8c120a7b5 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2901,8 +2901,9 @@ source_set("browser") {

8
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -44,10 +44,10 @@ index 90c6a5b6999571819ef71f859767cccf635ea883..d08149b8cb57ca357a2304fc9a8b8be4
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index fdd0eacf647dd9097bdb59ff408fcd46e078dd72..020dc08a3d8a83fe1f82e3f3ae65f2a18bd4935b 100644
index 75d6d7b62778fc00bb9b131e11eaef0431abcb29..0b9b22ed11db2aaa5cb4290370aa38bf739e415d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4768,6 +4768,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4808,6 +4808,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -60,10 +60,10 @@ index fdd0eacf647dd9097bdb59ff408fcd46e078dd72..020dc08a3d8a83fe1f82e3f3ae65f2a1
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 1c87dc4f4c015cd618a09c250c846a212229bd5e..b216a881167a53b88d548045f738b5aa173e3572 100644
index 3f156cadaff7ad24e65afe5dbb4592cd55b57ff5..6d1f349130fbb97ed1436b2b792d5f540f323433 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -975,6 +975,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -978,6 +978,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
void SendScreenRects() override;
void SendActiveState(bool active) override;
TextInputManager* GetTextInputManager() override;

12
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 ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d..fbae94d817d600df09052da88180d1e2a83361fa 100644
index 5a8b34ea90f32e12bd75c6b5318c743096e9694c..e1c1c39119d5b0fde1cc0d3649810309f2517ea2 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3221,6 +3221,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3252,6 +3252,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 ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d..fbae94d817d600df09052da88180d1e2
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3231,6 +3238,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3262,6 +3269,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
@ -35,10 +35,10 @@ index ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d..fbae94d817d600df09052da88180d1e2
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index eb085562fd557cc29f3666fbb4015fe719d04f5a..ea29ff6a0ea1fa93b96ea18c0a350988f6f3870b 100644
index 1c02ef782a296fe401396d1c078d658ee477db91..6fd5d339cef8e33dc6b60b46c6d152277e3cebfa 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -96,10 +96,13 @@ class BrowserContext;
@@ -97,10 +97,13 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@ -52,7 +52,7 @@ index eb085562fd557cc29f3666fbb4015fe719d04f5a..ea29ff6a0ea1fa93b96ea18c0a350988
class WebUI;
struct DropData;
struct MHTMLGenerationParams;
@@ -242,6 +245,10 @@ class WebContents : public PageNavigator,
@@ -243,6 +246,10 @@ class WebContents : public PageNavigator,
network::mojom::WebSandboxFlags starting_sandbox_flags =
network::mojom::WebSandboxFlags::kNone;

2
patches/chromium/webview_fullscreen.patch
View file

@ -14,7 +14,7 @@ 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 055b0bd53fea17e1df96f460aede20497d53216f..767205042a8e42b0420d618017eae83f449fa28b 100644
index 47b8f449cb5c71382f6b27bb1fd57651bc8a1891..5685abb498c46e461db697dbe7abd65aa81e7e34 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(