Skip to content

Commit 07e6b34

Browse files
chore: bump chromium to 128.0.6571.0 (main) (electron#42749)
* chore: bump chromium in DEPS to 128.0.6571.0 * 5636652: [4/n] Introduce RenderInputRouterClient and move InputRouterClient implementation to RenderInputRouter. https://chromium-review.googlesource.com/c/chromium/src/+/5636652 * 5655811: Revert "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""" https://chromium-review.googlesource.com/c/chromium/src/+/5655811 * 5581006: [tracing] Forward startup tracing config as shmem https://chromium-review.googlesource.com/c/chromium/src/+/5581006 * chore: fixup patch indices * 5608450: [Views AX] Move Image Auto Captioning strings to ui/ https://chromium-review.googlesource.com/c/chromium/src/+/5608450 * 5648900: [Extensions] Move ExtensionAPIEnabledForServiceWorkerScript() https://chromium-review.googlesource.com/c/chromium/src/+/5648900 * 5651681: Remove Web Speech API profanity masking https://chromium-review.googlesource.com/c/chromium/src/+/5651681 * 5651361: `content::RenderFrame::GetBrowserInterfaceBroker`: return a const-ref. https://chromium-review.googlesource.com/c/chromium/src/+/5651361 * 5604943: Start capture of toolbar after gesture end events are received https://chromium-review.googlesource.com/c/chromium/src/+/5604943 * 5624392: [BRP] Enforce raw_ptr/ref in Renderer code https://chromium-review.googlesource.com/c/chromium/src/+/5624392 * 5659259: Portals: Remove WebContentsView::TransferDragSecurityInfo https://chromium-review.googlesource.com/c/chromium/src/+/5659259 * 5230721: Move ComposeStatus to components/compose https://chromium-review.googlesource.com/c/chromium/src/+/5230721 * 5647894: [api] Cleanup usages of v8::ReturnValue<void>::Set[NonEmpty](..) https://chromium-review.googlesource.com/c/v8/v8/+/5647894 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <[email protected]>
1 parent cf5fb45 commit 07e6b34

File tree

61 files changed

+260
-240
lines changed

Some content is hidden

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

61 files changed

+260
-240
lines changed

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'128.0.6558.0',
5+
'128.0.6571.0',
66
'node_version':
77
'v20.15.0',
88
'nan_version':

build/extract_symbols.gni

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ template("extract_symbols") {
2424
assert(defined(invoker.binary), "Need binary to dump")
2525
assert(defined(invoker.symbol_dir), "Need directory for symbol output")
2626

27-
dump_syms_label =
28-
"//third_party/breakpad:dump_syms($host_system_allocator_toolchain)"
27+
if (host_os == "win" && target_cpu == "x86") {
28+
dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
29+
} else {
30+
dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
31+
}
2932
dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
3033
"/dump_syms$_host_executable_suffix"
3134

chromium_src/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,10 @@ static_library("chrome") {
240240
"//chrome/services/util_win:lib",
241241
"//components/webapps/common:mojo_bindings",
242242
]
243-
deps += [ "//components/segmentation_platform/public/proto" ]
243+
deps += [
244+
"//components/compose/core/browser:mojo_bindings",
245+
"//components/segmentation_platform/public/proto",
246+
]
244247
}
245248

246249
if (is_mac) {

electron_paks.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ template("electron_paks") {
187187
"${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
188188
"${root_gen_dir}/extensions/strings/extensions_strings_",
189189
"${root_gen_dir}/services/strings/services_strings_",
190-
"${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
191190
"${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
192191
"${root_gen_dir}/ui/strings/app_locale_settings_",
192+
"${root_gen_dir}/ui/strings/auto_image_annotation_strings_",
193193
"${root_gen_dir}/ui/strings/ax_strings_",
194194
"${root_gen_dir}/ui/strings/ui_strings_",
195195
]
@@ -204,8 +204,8 @@ template("electron_paks") {
204204
"//extensions/strings",
205205
"//services/strings",
206206
"//third_party/blink/public/strings",
207-
"//third_party/blink/public/strings:accessibility_strings",
208207
"//ui/strings:app_locale_settings",
208+
"//ui/strings:auto_image_annotation_strings",
209209
"//ui/strings:ax_strings",
210210
"//ui/strings:ui_strings",
211211
]

patches/chromium/add_didinstallconditionalfeatures.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ index c313c0342f0e470db13a4c95473decbc8dbdcbd3..10c6596a8cd06aebf19b4302a60eb78e
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 5849f1cfd4fbeaefa6a63a4bbe55850d590fbc4b..f52d145dc17d849db51e03ba28101dc94b856c3c 100644
26+
index e5c8967a41c7cd645dfc5d6589a540e2027024df..7810c2e1b50f31b497c6a5eaf0a66b61d22f2760 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
2929
@@ -4694,6 +4694,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -40,7 +40,7 @@ index 5849f1cfd4fbeaefa6a63a4bbe55850d590fbc4b..f52d145dc17d849db51e03ba28101dc9
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index 6a05d1440616f8745576f15b5ef7bf065fd33e66..c8d6293beccb80e7c3c09137a8f9162f2374ad25 100644
43+
index 74f337007151e491c02ae23ba4ca6f34f17bc65d..ff860ad1fb68dc5c1c7831f74b330be0c57c727a 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
4646
@@ -645,6 +645,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -53,7 +53,7 @@ index 6a05d1440616f8745576f15b5ef7bf065fd33e66..c8d6293beccb80e7c3c09137a8f9162f
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index 9ca9333ac023179a8d2bd655a44581baad23815d..d53b5f5632644a35554ecf036cc1dbf30044b32e 100644
56+
index 7219fbabf0f7286af48dede7738a9dcd5125cc1a..9e962391ebd2cfc84837502c5babcbbff385408b 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
5959
@@ -646,6 +646,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -79,10 +79,10 @@ index f7e0144c74f879e9b29871d7c372b99e127966bb..c3cd7b77ed282f212a56d151dc3fbec3
7979
if (World().IsMainWorld()) {
8080
probe::DidCreateMainWorldContext(GetFrame());
8181
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82-
index c5790f8f8487e5af8b910c1cde5f68f7ef970d21..fc51c1d0155ce776192e2332e0d7fe12fc7131ad 100644
82+
index 1cf963689a08009fa137e49eacd909495d6517d1..4860e3b627160e544c3108b7dfdc4e03946ac865 100644
8383
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
8484
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
85-
@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
85+
@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
8686

8787
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
8888
int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index c5790f8f8487e5af8b910c1cde5f68f7ef970d21..fc51c1d0155ce776192e2332e0d7fe12
9292
int32_t world_id) = 0;
9393
virtual bool AllowScriptExtensions() = 0;
9494
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
95-
index 7ff753fed6b1e3316e6589714796c1140ad63f2d..25ccd970b98eac0d804d6ea28fce6fd64c9e3648 100644
95+
index b91c2be322f9c66a07bded75afebde935f28cbe0..acb8d1c364a8b077eca88af9c4bf0e8bb46f9ee5 100644
9696
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9797
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9898
@@ -293,6 +293,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 7ff753fed6b1e3316e6589714796c1140ad63f2d..25ccd970b98eac0d804d6ea28fce6fd6
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
113-
index ad98bc759243e7aba5737bcc9b920a8fd6f00ff9..5aebc97962a0d1c11a77f16027f5807266e502a3 100644
113+
index 7bbdf577711526a1bc60820d5737cdd28ebf60f5..4df922e030d17a852b8cc7862a4ce8ec57425bfa 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116116
@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index ad98bc759243e7aba5737bcc9b920a8fd6f00ff9..5aebc97962a0d1c11a77f16027f58072
123123
int32_t world_id) override;
124124

125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index b3d016f4602a34298e4694ad314bbfb7807053d4..c3aa86cb772c45fd87b58acc91b9f4f295e9baf7 100644
126+
index da8f597a8eb45a5e0135a5f04b074b3756dd4921..c0f1a83db3171891b115eeb533f5bf1dcbad2c63 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -411,6 +411,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -412,6 +412,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

+2-2
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 6d9130547a9b6d486d556e7d58c8f138b728800e..cccd9b5d1c241fa91c1bbd09f8b370159c283262 100644
9+
index b5934f99861b11afe1b695ac25886ee0d059d0ab..419f823a094c1b163d7a5b441f1b034c0dada66b 100644
1010
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
1111
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
1212
@@ -163,6 +163,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
@@ -51,7 +51,7 @@ index 779e90581cdfb2d1bdd904da038f7537d0477f5a..c85620ac2f30998d1b67f159e50ee722
5151
void SendRendererPreferencesToRenderer(
5252
const blink::RendererPreferences& preferences);
5353
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
54-
index d16ed08f06d03b98fd83218def35b6754ffb016a..a5dbc30f709cc735202820cad9514ebf6c838d2d 100644
54+
index 1e481f12c8f2a42b5ec8e8d5f95fd7e6f83d9707..5d92d13e3c2b7f8bc1774eedb70eb10544efc174 100644
5555
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
5656
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
5757
@@ -570,8 +570,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {

patches/chromium/blink_local_frame.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ index 55343df3901f295f6570dfbcf74d326b6d0e1c4a..3ba0f8e60848147d61958f97d3ac0a89
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 72e8f9bc27f4b2a43af231cae6b79a660ba89986..90720065cd882da0ac6976c37655e1c81d660d5f 100644
52+
index dd58f6c3f8347a1981bbe97ddc9a6dce143bd6e6..80eac4a812056c663d86f01b98ebcdf7b4b0537a 100644
5353
--- a/third_party/blink/renderer/core/frame/local_frame.cc
5454
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
55-
@@ -736,10 +736,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
55+
@@ -730,10 +730,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
5656
}
5757
DCHECK(!view_ || !view_->IsAttached());
5858

@@ -63,7 +63,7 @@ index 72e8f9bc27f4b2a43af231cae6b79a660ba89986..90720065cd882da0ac6976c37655e1c8
6363
if (!Client())
6464
return false;
6565

66-
@@ -792,6 +788,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
66+
@@ -786,6 +782,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
6767
DCHECK(!view_->IsAttached());
6868
Client()->WillBeDetached();
6969

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

+7-7
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 f83e034dedeebe362119148dda4fcc8da5433375..aa537811d218d5717120c59f7a9884b57b78a0dc 100644
14+
index a1dbb6af74046225e9dc46f72eca9feb164bf453..091357f99a23806a2ddb7bc62df9d671fb4f16de 100644
1515
--- a/chrome/BUILD.gn
1616
+++ b/chrome/BUILD.gn
1717
@@ -192,11 +192,16 @@ if (!is_android && !is_mac) {
@@ -33,10 +33,10 @@ index f83e034dedeebe362119148dda4fcc8da5433375..aa537811d218d5717120c59f7a9884b5
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index 7ffdfa492277432eceeda1014ec6281d6a3469d6..8c41295161bec5896ac160cb291cc511558f836d 100644
36+
index 49984d371958bd2564ee140bdd661289b23df662..4e35af979dc6015c50ddfe59b2e758a95e6d852e 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4858,7 +4858,7 @@ static_library("browser") {
39+
@@ -4829,7 +4829,7 @@ static_library("browser") {
4040

4141
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
4242
# than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 7ffdfa492277432eceeda1014ec6281d6a3469d6..8c41295161bec5896ac160cb291cc511
4646
sources += [ "certificate_viewer_stub.cc" ]
4747
}
4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 71acc090b04fda6425131a523ad03ae5cdf24f62..32909a4001359d34311a1e4fc8222ad0ee8f7f11 100644
49+
index 9a9f0b9f587f4a9562823823863647390239e9aa..6ad49fdbcb95773ba5b819ca710ce4a7e0d45317 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
52-
@@ -7412,9 +7412,12 @@ test("unit_tests") {
52+
@@ -7405,9 +7405,12 @@ test("unit_tests") {
5353
"//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
5454
]
5555

@@ -63,7 +63,7 @@ index 71acc090b04fda6425131a523ad03ae5cdf24f62..32909a4001359d34311a1e4fc8222ad0
6363
"//chrome//services/util_win:unit_tests",
6464
"//chrome/app:chrome_dll_resources",
6565
"//chrome/app:win_unit_tests",
66-
@@ -8423,6 +8426,10 @@ test("unit_tests") {
66+
@@ -8419,6 +8422,10 @@ test("unit_tests") {
6767
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
6868
]
6969

@@ -74,7 +74,7 @@ index 71acc090b04fda6425131a523ad03ae5cdf24f62..32909a4001359d34311a1e4fc8222ad0
7474
sources += [
7575
# The importer code is not used on Android.
7676
"../common/importer/firefox_importer_utils_unittest.cc",
77-
@@ -8503,7 +8510,6 @@ test("unit_tests") {
77+
@@ -8499,7 +8506,6 @@ test("unit_tests") {
7878

7979
# Non-android deps for "unit_tests" target.
8080
deps += [

patches/chromium/can_create_window.patch

+13-13
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 fdeb569224d06ce20f5cfd21cb0f40e3caaa2f6a..a248259b4cb999fb980df8589f41aa61e02b6131 100644
12+
index 0536c904b8e4ad8bfa9f4ab27250f979dab91b06..5873720454adfb5c4ab92c7748f9a2658a24c33f 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -8567,6 +8567,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -8581,6 +8581,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 fdeb569224d06ce20f5cfd21cb0f40e3caaa2f6a..a248259b4cb999fb980df8589f41aa61
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 4609735590ae06cb6d105b3d5eeadb91ee3cc352..8f283acb574f02e37e7e8953e39b1095e0f92669 100644
24+
index 1307fb18bb042f4aa2f099ab920aa0346d382a1b..bc5fc8b9e2660d1e6fa97598ff951040512c846c 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -4762,6 +4762,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27+
@@ -4763,6 +4763,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2828

2929
auto* new_contents_impl = new_contents.get();
3030

@@ -37,7 +37,7 @@ index 4609735590ae06cb6d105b3d5eeadb91ee3cc352..8f283acb574f02e37e7e8953e39b1095
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-
@@ -4803,12 +4809,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
40+
@@ -4804,12 +4810,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
4141
AddWebContentsDestructionObserver(new_contents_impl);
4242
}
4343

@@ -66,10 +66,10 @@ index 6df9186bcee6a56da11da8e365c7cf5b4375e366..0fdda1a6e0ac98a8c8619b4d4fab5977
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 2668ab84237c37b7df1e2b19ceda0ed012c0c072..8a7bdd7ff737795411368ce41e94bba8eb53bd0a 100644
69+
index c15c7f969951bab98be416b3a57e0f8ebd46c4bc..927d85c07c11b4b4e2fe56125d38ef3b5477f172 100644
7070
--- a/content/public/browser/content_browser_client.cc
7171
+++ b/content/public/browser/content_browser_client.cc
72-
@@ -741,6 +741,8 @@ bool ContentBrowserClient::CanCreateWindow(
72+
@@ -742,6 +742,8 @@ bool ContentBrowserClient::CanCreateWindow(
7373
const std::string& frame_name,
7474
WindowOpenDisposition disposition,
7575
const blink::mojom::WindowFeatures& features,
@@ -79,7 +79,7 @@ index 2668ab84237c37b7df1e2b19ceda0ed012c0c072..8a7bdd7ff737795411368ce41e94bba8
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 e5c261c9d1eaa5550609ac28a6fcfebebf0ee091..223265d74f6c5056e5e6af6adcb115cf406f0c5f 100644
82+
index bf8a6e4636065003dd33f0da71d006278ffa6b5f..e04ef368815fa5e5a281e0dc785f180bce77369d 100644
8383
--- a/content/public/browser/content_browser_client.h
8484
+++ b/content/public/browser/content_browser_client.h
8585
@@ -188,6 +188,7 @@ class NetworkService;
@@ -90,7 +90,7 @@ index e5c261c9d1eaa5550609ac28a6fcfebebf0ee091..223265d74f6c5056e5e6af6adcb115cf
9090
} // namespace network
9191

9292
namespace sandbox {
93-
@@ -1255,6 +1256,8 @@ class CONTENT_EXPORT ContentBrowserClient {
93+
@@ -1273,6 +1274,8 @@ class CONTENT_EXPORT ContentBrowserClient {
9494
const std::string& frame_name,
9595
WindowOpenDisposition disposition,
9696
const blink::mojom::WindowFeatures& features,
@@ -148,10 +148,10 @@ index fd851a9347dd6920e035bc9183991ea2a275aff4..579a796fcfdecf44ab415ceebc30b427
148148
// typically happens when popups are created.
149149
virtual void WebContentsCreated(WebContents* source_contents,
150150
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
151-
index a734cc0568ba54c1c792c494a0e8fab7345bad84..5849f1cfd4fbeaefa6a63a4bbe55850d590fbc4b 100644
151+
index a8dec1b3471abcda88cb03470906389bf29b3503..e5c8967a41c7cd645dfc5d6589a540e2027024df 100644
152152
--- a/content/renderer/render_frame_impl.cc
153153
+++ b/content/renderer/render_frame_impl.cc
154-
@@ -6664,6 +6664,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
154+
@@ -6667,6 +6667,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
155155
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
156156
GetWebFrame()->IsAdScriptInStack());
157157

@@ -189,7 +189,7 @@ index 53949c3510d0755e608847e174de63f46c8c2363..f6644476d8714fd02480830ebb0f0571
189189
bool opener_suppressed,
190190
bool* no_javascript_access) override;
191191
diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
192-
index c79c07788b16c394ed413a6a739b7dcdd4697496..1b25625d84fe6b2c64de106b4e86e9acc09a0c36 100644
192+
index 7c901dcc9f171a936ee6eb41dfd899a095a8a915..71748ad3a28946f816e2001ba78bbcb56cac7629 100644
193193
--- a/third_party/blink/public/web/web_window_features.h
194194
+++ b/third_party/blink/public/web/web_window_features.h
195195
@@ -35,6 +35,7 @@
@@ -200,7 +200,7 @@ index c79c07788b16c394ed413a6a739b7dcdd4697496..1b25625d84fe6b2c64de106b4e86e9ac
200200

201201
namespace blink {
202202

203-
@@ -69,6 +70,8 @@ struct WebWindowFeatures {
203+
@@ -70,6 +71,8 @@ struct WebWindowFeatures {
204204
// TODO(apaseltiner): Investigate moving this field to a non-public struct
205205
// since it is only needed within //third_party/blink.
206206
std::optional<WebVector<WebString>> attribution_srcs;

patches/chromium/chore_add_electron_deps_to_gitignores.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 50992a3f4502d46a1bc2713c25bec6095c541ffa..121a09d7fa00162fe64ce901cae96d8f
1818
/googleurl
1919
/gpu/gles2_conform_test
2020
diff --git a/third_party/.gitignore b/third_party/.gitignore
21-
index 9a642e94c58fa85a2122095c3bc8191eb16826ec..27cf90e1ddb16680be9b90e1be62efec98dc17b2 100644
21+
index 361b6ad8fea1b6caa4ffa35ddb73b813fab0e388..234c469cbbc611f3cb1b05bb71e36729606009b4 100644
2222
--- a/third_party/.gitignore
2323
+++ b/third_party/.gitignore
24-
@@ -51,7 +51,9 @@
24+
@@ -48,7 +48,9 @@
2525
/cygwin
2626
/devserver
2727
/directxsdk
@@ -31,15 +31,15 @@ index 9a642e94c58fa85a2122095c3bc8191eb16826ec..27cf90e1ddb16680be9b90e1be62efec
3131
/espresso/lib/
3232
/eyesfree/src
3333
/fuchsia-sdk/images
34-
@@ -107,6 +109,7 @@
34+
@@ -104,6 +106,7 @@
3535
/mockito/src
3636
/nacl_sdk_binaries/
3737
/ninja
3838
+/nan
3939
/node/*.tar.gz
4040
/node/linux/
4141
/node/mac/
42-
@@ -156,6 +159,7 @@
42+
@@ -153,6 +156,7 @@
4343
/spirv-headers/src
4444
/spirv-tools/src
4545
/sqlite4java/lib/

0 commit comments

Comments
 (0)