Skip to content

Commit d842d17

Browse files
electron-roller[bot]jkleinsc
electron-roller[bot]
and
jkleinsc
authored
chore: bump chromium to 137.0.7151.0 (main) (electron#46854)
* chore: bump chromium in DEPS to 137.0.7151.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>
1 parent ecd7453 commit d842d17

15 files changed

Lines changed: 47 additions & 48 deletions

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'137.0.7149.0',
5+
'137.0.7151.0',
66
'node_version':
77
'v22.14.0',
88
'nan_version':

‎patches/chromium/build_allow_electron_to_use_exec_script.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: build: allow electron to use exec_script
66
This is similar to the //build usecase so we're OK adding ourselves here
77

88
diff --git a/.gn b/.gn
9-
index 09c0044a0eb116efc03f4406a29003e7948a39bb..a185f4f0c7061a2b12895196583bd256e06614fb 100644
9+
index ae58a0b0a64ae1fdb3f9cd8587041d71a121c6b9..7a1373c1cb78133375071cf5479561b64376b4dc 100644
1010
--- a/.gn
1111
+++ b/.gn
12-
@@ -168,4 +168,26 @@ exec_script_allowlist =
12+
@@ -167,4 +167,26 @@ exec_script_allowlist =
1313

1414
"//tools/grit/grit_rule.gni",
1515
"//tools/gritsettings/BUILD.gn",

‎patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
1111
patch.
1212

1313
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
14-
index 39ef34bbd58d51d8453dcb076bb6e45ec78a3832..119d7e409b46995ff602989e9308e2d39f6820ed 100644
14+
index 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b47749874 100644
1515
--- a/chrome/BUILD.gn
1616
+++ b/chrome/BUILD.gn
1717
@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index 39ef34bbd58d51d8453dcb076bb6e45ec78a3832..119d7e409b46995ff602989e9308e2d3
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 03805c70105cf375bb5959a6b30d91e1c86a2466..c817919101f77b4571964b94007f9204b5873248 100644
36+
index ad39862fdd9a5a4f827f36e6a9778223a638d831..518ab769287525b1977387df56d1f50d1f0778f2 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4617,7 +4617,7 @@ static_library("browser") {
39+
@@ -4627,7 +4627,7 @@ static_library("browser") {
4040
[ "//chrome/browser/ui/webui/signin:profile_impl" ]
4141
}
4242

@@ -46,10 +46,10 @@ index 03805c70105cf375bb5959a6b30d91e1c86a2466..c817919101f77b4571964b94007f9204
4646
# than here in :chrome_dll.
4747
deps += [ "//chrome:packed_resources_integrity_header" ]
4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea97c024e9a 100644
49+
index 1b52a0d1a249c5d8beb205358c2003202c9253a0..4fbf2f66adfccb3580176be8d25598cf9ffcb616 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -7174,9 +7174,12 @@ test("unit_tests") {
52+
@@ -7187,9 +7187,12 @@ test("unit_tests") {
5353
"//chrome/notification_helper",
5454
]
5555

@@ -63,7 +63,7 @@ index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea9
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -8142,6 +8145,10 @@ test("unit_tests") {
66+
@@ -8155,6 +8158,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea9
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -8197,7 +8204,6 @@ test("unit_tests") {
77+
@@ -8210,7 +8217,6 @@ test("unit_tests") {
7878
# Non-android deps for "unit_tests" target.
7979
deps += [
8080
"../browser/screen_ai:screen_ai_install_state",

‎patches/chromium/can_create_window.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ index 55bb4ae3bab4cdf20b3e1dde9450a5c0e4e62b37..fe444c7fa140166a1b65c7a8a2676e2d
6666

6767
// Operation result when the renderer asks the browser to create a new window.
6868
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
69-
index 0c3731448b236cedd333aa0a9a0b01577596d4bc..cd3ab7d799e31b2ce0f9b7a280121b07d740865d 100644
69+
index 9c36ad70531bd8c31158c741ab23763ea00bc068..6909f75fb4cbd0e7b4f3067cda52a5f67dc100de 100644
7070
--- a/content/public/browser/content_browser_client.cc
7171
+++ b/content/public/browser/content_browser_client.cc
7272
@@ -821,6 +821,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -79,7 +79,7 @@ index 0c3731448b236cedd333aa0a9a0b01577596d4bc..cd3ab7d799e31b2ce0f9b7a280121b07
7979
bool opener_suppressed,
8080
bool* no_javascript_access) {
8181
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
82-
index d8b137849e15749e011b1c8ae1cb78cd0ed47844..f25e2eaeacfef82ca904e40f8b7b3913a121db9d 100644
82+
index f1fee091b84aec20f1e15dcc90917e50bb47d1c6..3a7a6dc0a4e75c151379f8488d371439a808f1a9 100644
8383
--- a/content/public/browser/content_browser_client.h
8484
+++ b/content/public/browser/content_browser_client.h
8585
@@ -199,6 +199,7 @@ class NetworkService;

‎patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ index 4fd8dff1089cd6afa6a66dc185734d7671657281..0a1f4268ea771a3d5d4a2668928c6e5d
8080
content::WebContents* source,
8181
const content::OpenURLParams& params,
8282
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
83-
index acb3a3aa595f3e6694270c928b9422388c0f25a5..670f77936863c686aca70072e9d42293463a6a28 100644
83+
index 435235c067f70f7f3d219dfc0bf91c9be40d1389..cc6c860ec51075fc047a77c26c5b42296bb6ab19 100644
8484
--- a/chrome/browser/ui/browser.cc
8585
+++ b/chrome/browser/ui/browser.cc
86-
@@ -2314,12 +2314,11 @@ bool Browser::IsWebContentsCreationOverridden(
86+
@@ -2323,12 +2323,11 @@ bool Browser::IsWebContentsCreationOverridden(
8787
content::SiteInstance* source_site_instance,
8888
content::mojom::WindowContainerType window_container_type,
8989
const GURL& opener_url,

‎patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ index 99bf736ebe303d46ab1ced924ba929a0cd258909..e10c8782d2704ff9cff8062d201a4339
112112
string mime_type;
113113

114114
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
115-
index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc688ecda1af 100644
115+
index 937a7b2ba05c11514d2d980a6fb2eaa9102c2774..6ffe746744beccbf224ad1a36ad102da5164580f 100644
116116
--- a/services/network/url_loader.cc
117117
+++ b/services/network/url_loader.cc
118118
@@ -387,6 +387,9 @@ URLLoader::URLLoader(
@@ -134,7 +134,7 @@ index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc68
134134
url_request_->SetResponseHeadersCallback(base::BindRepeating(
135135
&URLLoader::SetRawResponseHeaders, base::Unretained(this)));
136136
}
137-
@@ -1224,6 +1227,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
137+
@@ -1225,6 +1228,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
138138
}
139139

140140
response_ = BuildResponseHead();
@@ -153,7 +153,7 @@ index 3e081d9cd2ce10dc0e8039c7d2272d9eb8722888..d4f980aeb42620af6c3f51ff4d0efc68
153153
+ }
154154
DispatchOnRawResponse();
155155

156-
ad_auction_event_record_request_helper_.HandleResponse(*url_request_);
156+
ad_auction_event_record_request_helper_.HandleResponse(
157157
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
158158
index 6832aca0d487d5cbf2fc445f1f07a17565cf9d45..78618a2c3d79455ff685d58d11b61d3d8468b7e1 100644
159159
--- a/services/network/url_loader.h

‎patches/chromium/feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index 6c36ada80f6f225b84a8f3832405128f8ba83224..714d582d1060873765b24770b18eddcb
5858
NOTREACHED();
5959
}
6060
diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc
61-
index 8abbc34ec283562685a46e10142901110b5c0b55..1c436c62cac1bc4b21255bdcbb2c18b882c4058b 100644
61+
index b19b5781f426bdfd4a8b6dfbead0f854545ca90a..9833c25f97e55ab7e7095243c307a90fbf4b53d8 100644
6262
--- a/third_party/blink/common/permissions/permission_utils.cc
6363
+++ b/third_party/blink/common/permissions/permission_utils.cc
6464
@@ -101,6 +101,8 @@ std::string GetPermissionString(PermissionType permission) {
@@ -71,9 +71,9 @@ index 8abbc34ec283562685a46e10142901110b5c0b55..1c436c62cac1bc4b21255bdcbb2c18b8
7171
NOTREACHED();
7272
}
7373
@@ -175,6 +177,7 @@ PermissionTypeToPermissionsPolicyFeature(PermissionType permission) {
74+
case PermissionType::NOTIFICATIONS:
75+
case PermissionType::KEYBOARD_LOCK:
7476
case PermissionType::POINTER_LOCK:
75-
// TODO(crbug.com/394009026): Add permission policy for LNA.
76-
case PermissionType::LOCAL_NETWORK_ACCESS:
7777
+ case PermissionType::DEPRECATED_SYNC_CLIPBOARD_READ:
7878
return std::nullopt;
7979

@@ -141,7 +141,7 @@ index c269698764bb8ae7f85c5d476436f5ae5209576d..65d7fd94128a755609192784722074c6
141141

142142
bool ClipboardCommands::ExecuteCopy(LocalFrame& frame,
143143
diff --git a/third_party/blink/renderer/modules/permissions/permission_utils.cc b/third_party/blink/renderer/modules/permissions/permission_utils.cc
144-
index 843a4f27807071eabfdbffce589a31ddac75aacb..8d189eae97caa48a5796c540a74aaafa2fa676ff 100644
144+
index 691726eb23434005adc559534fc0aeede937cc92..a980ed6afb84eceef9c9b594b325e8e3783821ec 100644
145145
--- a/third_party/blink/renderer/modules/permissions/permission_utils.cc
146146
+++ b/third_party/blink/renderer/modules/permissions/permission_utils.cc
147147
@@ -145,6 +145,8 @@ String PermissionNameToString(PermissionName name) {

‎patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ We also need to ensure that an initial paint is scheduled when
1515
the compositor is unsuspended in headles mode.
1616

1717
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
18-
index 1d77de15d281c597c1cb3dbca04eb4d8e16cc11d..187bb87a0b356551e2260f480de326c574aa914b 100644
18+
index b51482ecbb8eaed649ae0ea9dd9c7c71125b51a2..0180a182a8b55df4e515d77f696fa442ab31ae01 100644
1919
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
2020
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
2121
@@ -663,9 +663,10 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -31,10 +31,10 @@ index 1d77de15d281c597c1cb3dbca04eb4d8e16cc11d..187bb87a0b356551e2260f480de326c5
3131

3232
// Register the CGWindowID (used to identify this window for video capture)
3333
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
34-
index 9087ed4c1035104e4c5f32e86f81dae6aad09d3d..18f82c39b63269daf34a91d805c94070de9cd271 100644
34+
index 65154f18c7ce737ea1b48ebd9308896d8a13f622..ec821403356d2d45c9c12831a89704be10ee05f7 100644
3535
--- a/ui/views/widget/widget.h
3636
+++ b/ui/views/widget/widget.h
37-
@@ -1239,6 +1239,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
37+
@@ -1238,6 +1238,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
3838
// True if widget was created in headless mode.
3939
bool is_headless() const { return is_headless_; }
4040

‎patches/chromium/frame_host_manager.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index d26c850e28b7df6992bf07fda2abe260ed4da769..008c131e5b4f84daeaee5ffe6ab7ae88
2020
}
2121

2222
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
23-
index f25e2eaeacfef82ca904e40f8b7b3913a121db9d..d0993b89a686dcc0428b2ef0bc3f20dfc7a49199 100644
23+
index 3a7a6dc0a4e75c151379f8488d371439a808f1a9..0869aef8fce2829f7827d36c73af65ad71f7fdd3 100644
2424
--- a/content/public/browser/content_browser_client.h
2525
+++ b/content/public/browser/content_browser_client.h
2626
@@ -340,6 +340,11 @@ class CONTENT_EXPORT ContentBrowserClient {

‎patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
1111
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
1212

1313
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
14-
index 8f419c43dcb0bb4b882d04db7fadbcd25560ece0..709cca39197ef74c304cdef1cab750f244f9bf29 100755
14+
index 108d33c2e6380749b80631b57931af6beaf44404..ad7b3f3a4e0190983ee68b1503a38847d9f94014 100755
1515
--- a/tools/clang/scripts/update.py
1616
+++ b/tools/clang/scripts/update.py
17-
@@ -304,6 +304,8 @@ def GetDefaultHostOs():
17+
@@ -307,6 +307,8 @@ def GetDefaultHostOs():
1818
'win32': 'win',
1919
}
2020
default_host_os = _PLATFORM_HOST_OS_MAP.get(sys.platform, sys.platform)

0 commit comments

Comments
 (0)