Skip to content

Commit f2240e0

Browse files
chore: bump chromium to 137.0.7149.0 (main) (electron#46777)
* chore: bump chromium in DEPS to 137.0.7144.0 * chore: bump chromium in DEPS to 137.0.7145.0 * chore: bump chromium in DEPS to 137.0.7147.0 * chore: update patches * Remove deprecated GetVar(std::string_view, std::string*) overload Refs https://chromium-review.googlesource.com/c/chromium/src/+/6468873 * fixup! Remove deprecated GetVar(std::string_view, std::string*) overload * fixup! Remove deprecated GetVar(std::string_view, std::string*) overload * chore: bump chromium in DEPS to 137.0.7149.0 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
1 parent 0c103f3 commit f2240e0

47 files changed

Lines changed: 174 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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.7143.0',
5+
'137.0.7149.0',
66
'node_version':
77
'v22.14.0',
88
'nan_version':

patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: allow disabling blink scheduler throttling per RenderView
66
This allows us to disable throttling for hidden windows.
77

88
diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
9-
index a4ed89e2211ad793310c0595d329dbbd4b2c0b34..73a14f1569329baa0830d5cf8c993fe9264f7c74 100644
9+
index f9b27264f7e3e1f8de6f088ccb78e4a4693c5e93..85aebec5028fd6b324a1f1d9416fbf99c150e09a 100644
1010
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
1111
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
1212
@@ -168,6 +168,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {

patches/chromium/blink_local_frame.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 2072f6b14289b1f3a76dbccc98f29aa178c1c35c..d7017437a7e7e6ac130677e52731d048
4949
// its owning reference back to our owning LocalFrame.
5050
client_->Detached(type);
5151
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
52-
index c8eb0358c9b486f6332f93fb574e7d22c3c2ab0e..bb0ab8b88dc62bbe2bd208928453a23d73c41679 100644
52+
index ecaae5e1a2911b122678b2f4f77b5796323ad0bf..fbfd4d96e8082df8c5db5d354ac7c39bc329d4ee 100644
5353
--- a/third_party/blink/renderer/core/frame/local_frame.cc
5454
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
5555
@@ -753,10 +753,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

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 b8756e53903be9d9760080391b0fc50909945749..ce957d8efd45f546db5d695e3ad1c660217be5e1 100644
9+
index 09c0044a0eb116efc03f4406a29003e7948a39bb..a185f4f0c7061a2b12895196583bd256e06614fb 100644
1010
--- a/.gn
1111
+++ b/.gn
12-
@@ -173,4 +173,26 @@ exec_script_allowlist =
12+
@@ -168,4 +168,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 69502170fe7a4d37773ad3e9cd7eeaf63fe1984d..fe0de5d0ec23121bd43acd641afcab2e50573a68 100644
14+
index 39ef34bbd58d51d8453dcb076bb6e45ec78a3832..119d7e409b46995ff602989e9308e2d39f6820ed 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 69502170fe7a4d37773ad3e9cd7eeaf63fe1984d..fe0de5d0ec23121bd43acd641afcab2e
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 416399ec9fb7876dcb95775cf1d2dd91a322c71b..961197adbf99391660abbf60bbfa34c522f91fc8 100644
36+
index 03805c70105cf375bb5959a6b30d91e1c86a2466..c817919101f77b4571964b94007f9204b5873248 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4609,7 +4609,7 @@ static_library("browser") {
39+
@@ -4617,7 +4617,7 @@ static_library("browser") {
4040
[ "//chrome/browser/ui/webui/signin:profile_impl" ]
4141
}
4242

@@ -46,10 +46,10 @@ index 416399ec9fb7876dcb95775cf1d2dd91a322c71b..961197adbf99391660abbf60bbfa34c5
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 bdc86bb7f4592b147ea051349a749c3f26d9ea4f..7073a7279d1b67f06adc392318c658dda74a2ef6 100644
49+
index 99aa117b2ade28e6e41068e463703e816eb3da55..2572a43601d5e10a894b9fe08c038ea97c024e9a 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -7182,9 +7182,12 @@ test("unit_tests") {
52+
@@ -7174,9 +7174,12 @@ test("unit_tests") {
5353
"//chrome/notification_helper",
5454
]
5555

@@ -63,7 +63,7 @@ index bdc86bb7f4592b147ea051349a749c3f26d9ea4f..7073a7279d1b67f06adc392318c658dd
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -8148,6 +8151,10 @@ test("unit_tests") {
66+
@@ -8142,6 +8145,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index bdc86bb7f4592b147ea051349a749c3f26d9ea4f..7073a7279d1b67f06adc392318c658dd
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -8203,7 +8210,6 @@ test("unit_tests") {
77+
@@ -8197,7 +8204,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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12-
index f4b76ef5bf500b8eb9d965dfdefac8e3b570edc3..5b02e27e3ea06561ddac8ad700bf073701eab73a 100644
12+
index ebf407904b9b9bc7f60a9c13a5c39ce64640189d..7b45a0006af60400f5d8ba5b925f971cb5cf393e 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -9772,6 +9772,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -9778,6 +9778,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1616
last_committed_origin_, params->window_container_type,
1717
params->target_url, params->referrer.To<Referrer>(),
1818
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index f4b76ef5bf500b8eb9d965dfdefac8e3b570edc3..5b02e27e3ea06561ddac8ad700bf0737
2121
&no_javascript_access);
2222

2323
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24-
index 132230946c506d077986aa07c7276b0adaf5fc90..cdf14dcd6ebd9be63a47ff7ba68120e9878c68f5 100644
24+
index fe352434dd26ebbde72145df335520ff9d026e80..4f87894219452e736311ad25a62b71b8aec4d158 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -5118,6 +5118,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27+
@@ -5126,6 +5126,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2828
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
2929
opener);
3030

@@ -37,7 +37,7 @@ index 132230946c506d077986aa07c7276b0adaf5fc90..cdf14dcd6ebd9be63a47ff7ba68120e9
3737
// If the new frame has a name, make sure any SiteInstances that can find
3838
// this named frame have proxies for it. Must be called after
3939
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
40-
@@ -5159,12 +5165,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
40+
@@ -5167,12 +5173,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
4141
AddWebContentsDestructionObserver(new_contents_impl);
4242
}
4343

@@ -163,7 +163,7 @@ index 5af26eef19c2f7ce082af02cff6d8f919c4d245d..e3f9f9406f51d4d4cb48fd35d33ee3d6
163163
// moved on send.
164164
bool is_background_tab =
165165
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
166-
index 7c4f2f67cf934472eac4a678fbced01c177c9b47..584faf64137ea3eb939e795684061c9b70ad6263 100644
166+
index 75bd6c082dbda49bd5ee177105d78b670d147034..bceb8a8acf9a23d0d1df2d6749b94f4c98ee72ec 100644
167167
--- a/content/web_test/browser/web_test_content_browser_client.cc
168168
+++ b/content/web_test/browser/web_test_content_browser_client.cc
169169
@@ -535,6 +535,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(

patches/chromium/chore_add_electron_deps_to_gitignores.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ index 0a0f0118d5c1a5a2f3ad28b068bebb849eba7246..5ca6d03b709ef119ccd6482b2f305f8a
1818
/googleurl
1919
/gpu/gles2_conform_test
2020
diff --git a/third_party/.gitignore b/third_party/.gitignore
21-
index 3e117f79191d5cea0fb4f1c6b0e95513562d7691..f197d17a55a802b01aaba602eff7c83f2a55c7b5 100644
21+
index ad591b3a0f2afe24d53dac76655f81790c1baa50..080d19d34659290e70f599e3d91da286013be76f 100644
2222
--- a/third_party/.gitignore
2323
+++ b/third_party/.gitignore
24-
@@ -45,7 +45,9 @@
25-
/devserver
24+
@@ -46,7 +46,9 @@
2625
/directxsdk
26+
/dragonbox/src
2727
/edk2
2828
+/electron_node
2929
/elfutils/src
3030
+/engflow-reclient-configs/
3131
/espresso/lib/
3232
/eyesfree/src
3333
/fast_float/src
34-
@@ -93,6 +95,7 @@
34+
@@ -94,6 +96,7 @@
3535
/mocha
3636
/mockito/src
3737
/nacl_sdk_binaries/
3838
+/nan
3939
/ninja
4040
/node/*.tar.gz
4141
/node/linux/
42-
@@ -137,7 +140,7 @@
42+
@@ -138,7 +141,7 @@
4343
/spirv-cross/src
4444
/spirv-headers/src
4545
/spirv-tools/src

patches/chromium/chore_partial_revert_of.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
1414
by changing something in Electron.
1515

1616
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
17-
index 30ed2f38b7d2b7909bcab3fc593ef635e72a96e1..e288cf5bfd3dfa1a2ca499293130c582ae8c354b 100644
17+
index 4c30f71ced0da645637c989c08ccc93e463e755f..56b2fb93d5d85f520081de9e42e26ef3f8f6090e 100644
1818
--- a/content/browser/web_contents/web_contents_impl.cc
1919
+++ b/content/browser/web_contents/web_contents_impl.cc
20-
@@ -5037,7 +5037,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
20+
@@ -5045,7 +5045,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2121
: IsGuest();
2222
// While some guest types do not have a guest SiteInstance, the ones that
2323
// don't all override WebContents creation above.

patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch

Lines changed: 6 additions & 6 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 4650a05dbfa8fb464a6264fc6d4f0108fbd60150..9f70060a0d581bafa5d74cc22c28285bc25b392a 100644
83+
index acb3a3aa595f3e6694270c928b9422388c0f25a5..670f77936863c686aca70072e9d42293463a6a28 100644
8484
--- a/chrome/browser/ui/browser.cc
8585
+++ b/chrome/browser/ui/browser.cc
86-
@@ -2310,12 +2310,11 @@ bool Browser::IsWebContentsCreationOverridden(
86+
@@ -2314,12 +2314,11 @@ bool Browser::IsWebContentsCreationOverridden(
8787
content::SiteInstance* source_site_instance,
8888
content::mojom::WindowContainerType window_container_type,
8989
const GURL& opener_url,
@@ -99,10 +99,10 @@ index 4650a05dbfa8fb464a6264fc6d4f0108fbd60150..9f70060a0d581bafa5d74cc22c28285b
9999

100100
WebContents* Browser::CreateCustomWebContents(
101101
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
102-
index 23e920f90bca09f0e1efacf1a4291f7080dce382..0f12cca9cba240f8b8e620fbf4f99cbf3e9e6ea8 100644
102+
index c4cea0b6e8c4c95ebcddf5497d731d1d63934f22..7686b75c5504d093dcd9dd8a7ffd28e0c2fd036c 100644
103103
--- a/chrome/browser/ui/browser.h
104104
+++ b/chrome/browser/ui/browser.h
105-
@@ -1025,8 +1025,7 @@ class Browser : public TabStripModelObserver,
105+
@@ -1026,8 +1026,7 @@ class Browser : public TabStripModelObserver,
106106
content::SiteInstance* source_site_instance,
107107
content::mojom::WindowContainerType window_container_type,
108108
const GURL& opener_url,
@@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
218218
content::WebContents* AddNewContents(
219219
content::WebContents* source,
220220
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
221-
index 6e9b45c4b257edd7e7a5c452f709a0b9b64250fe..6dbbe9cf521eb5b165f1de1fc1db2a01e69e5d9b 100644
221+
index 7a8d7ce6f628123f5288d693046ca7602eeccac1..f73f2ac411c0af45d7c0a4ba94222b2bd1d4841c 100644
222222
--- a/content/browser/web_contents/web_contents_impl.cc
223223
+++ b/content/browser/web_contents/web_contents_impl.cc
224-
@@ -5000,8 +5000,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
224+
@@ -5008,8 +5008,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
225225
// TODO(crbug.com/40202416): Support a way for MPArch guests to support this.
226226
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
227227
source_site_instance, params.window_container_type,

patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@ index a53b4901dde0dc83dce6c9b56616eef0d02d94a5..b419672af985f673f375fbb63b4d2b2c
9999
protected:
100100
~WebSettings() = default;
101101
diff --git a/third_party/blink/renderer/build/scripts/core/css/css_properties.py b/third_party/blink/renderer/build/scripts/core/css/css_properties.py
102-
index aa3a6b93cceae8c8bfbefdd7a043ae576f921979..17544d7ed4757fb51e2f82fd1b90638131ba05cc 100755
102+
index 6e991652d242795e292cea4c94cff59aaea078fa..b6834c78575520bb6e584dd2ce3333ac17299fef 100755
103103
--- a/third_party/blink/renderer/build/scripts/core/css/css_properties.py
104104
+++ b/third_party/blink/renderer/build/scripts/core/css/css_properties.py
105-
@@ -313,7 +313,7 @@ class CSSProperties(object):
106-
if name_without_leading_dash.startswith('-'):
105+
@@ -314,7 +314,7 @@ class CSSProperties(object):
107106
name_without_leading_dash = name_without_leading_dash[1:]
108107
internal_visited_order = 1
109-
- if name_without_leading_dash.startswith('internal-visited-'):
110-
+ if name_without_leading_dash.startswith('internal-'):
108+
if name_without_leading_dash.startswith(
109+
- 'internal-visited-'
110+
+ 'internal-'
111+
) or name_without_leading_dash.startswith(
112+
'internal-forced-visited-'):
111113
internal_visited_order = 0
112-
property_.sorting_key = (-property_.priority,
113-
internal_visited_order,
114114
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
115115
index c3dfa4c1f53a6ebba5735214037e0d1c6a88961d..17a08450227844dceccbaab7ff9de60d6e058b1f 100644
116116
--- a/third_party/blink/renderer/core/css/css_properties.json5
@@ -307,10 +307,10 @@ index 2c2f4f405074e5baa4a26f255283404f86b40e21..ebeb7d6988ee9e6a4e78cb82fc01fdad
307307

308308
ContouredRect PixelSnappedContouredBorderInternal(
309309
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
310-
index d419aae417d76f6f2e5a477e28dbb980e28ce07e..ddf8b3bd075914c52c0275049145cda95ac4ca70 100644
310+
index 6718aad4a16cd99c8dd7118ca62cebd29ffbfe97..39d426936b266d8f44ab8a614a48247462ceea2d 100644
311311
--- a/third_party/blink/renderer/platform/BUILD.gn
312312
+++ b/third_party/blink/renderer/platform/BUILD.gn
313-
@@ -1656,6 +1656,8 @@ component("platform") {
313+
@@ -1658,6 +1658,8 @@ component("platform") {
314314
"widget/widget_base.h",
315315
"widget/widget_base_client.h",
316316
"windows_keyboard_codes.h",

0 commit comments

Comments
 (0)