chore: bump chromium to 136.0.7103.25 (36-x-y) (#46603)
* chore: bump chromium in DEPS to 136.0.7103.25 * 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:
parent
22b6eefc50
commit
9d3696e4b3
13 changed files with 20 additions and 20 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'136.0.7103.17',
|
'136.0.7103.25',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v22.14.0',
|
'v22.14.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -23,10 +23,10 @@ index 44da0544b778d6ff4c14b6f4e8463cb8260d2f0d..8ae8939af4141a684b7a6d50a43e1abb
|
||||||
int32_t world_id) {}
|
int32_t world_id) {}
|
||||||
virtual void DidClearWindowObject() {}
|
virtual void DidClearWindowObject() {}
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index 4185aa3e07df8f2a3061d18e87f39cd5d79baead..81261373a194210d97c723ed525cb75a2bbeafad 100644
|
index b78c7f64fd5e21a8d89318791bf639ab367d2d48..e8850312da428bcb9ec45b7c8605be1e516b22de 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -4802,6 +4802,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
@@ -4800,6 +4800,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
||||||
observer.DidCreateScriptContext(context, world_id);
|
observer.DidCreateScriptContext(context, world_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ potentially prevent a window from being created.
|
||||||
TODO(loc): this patch is currently broken.
|
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
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 7d8baae182adb7664912c930463aa8b461ccbdc8..71fbe83a33fa247f82d7315767ff9a4aee9d3fca 100644
|
index d905ce52d71b2e2a4163fda68f584b3a3f305716..57a450929264e3f7592b5eab5126d176dbff8a58 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -9644,6 +9644,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -9644,6 +9644,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
|
@ -148,10 +148,10 @@ index da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f772
|
||||||
// typically happens when popups are created.
|
// typically happens when popups are created.
|
||||||
virtual void WebContentsCreated(WebContents* source_contents,
|
virtual void WebContentsCreated(WebContents* source_contents,
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index 0755a49ee7558ee0c5e76f602c514bb8a7c3a019..4185aa3e07df8f2a3061d18e87f39cd5d79baead 100644
|
index b46ceca2998e6f3706aff3705b9639948eebf60b..b78c7f64fd5e21a8d89318791bf639ab367d2d48 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -6927,6 +6927,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
@@ -6925,6 +6925,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
||||||
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
|
request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
|
||||||
GetWebFrame()->IsAdScriptInStack());
|
GetWebFrame()->IsAdScriptInStack());
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ index 930e0bd987c48d111b2c8d71147c09e4418bda6c..9373a53c5cac879c689fcea77f1dbbb3
|
||||||
void SetEnableReferrers(bool enable_referrers) override;
|
void SetEnableReferrers(bool enable_referrers) override;
|
||||||
#if BUILDFLAG(IS_CT_SUPPORTED)
|
#if BUILDFLAG(IS_CT_SUPPORTED)
|
||||||
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
||||||
index 6d79f4a4cb1a40be907ef52e35f0e5a0acab31fb..95ff46a7ca2654166d18027b986f6ec6c2a3d361 100644
|
index 399d0363749e9b79749185bcc1dcd746b026231e..1abd312f068e9326e4a9f95ed58bdb04e35afea8 100644
|
||||||
--- a/services/network/public/mojom/network_context.mojom
|
--- a/services/network/public/mojom/network_context.mojom
|
||||||
+++ b/services/network/public/mojom/network_context.mojom
|
+++ b/services/network/public/mojom/network_context.mojom
|
||||||
@@ -1275,6 +1275,9 @@ interface NetworkContext {
|
@@ -1275,6 +1275,9 @@ interface NetworkContext {
|
||||||
|
|
|
@ -187,7 +187,7 @@ index 96c9563aac5847e742de5d9c9236f78bcb6cfd9c..73c9d585579ad5bdc407687b8becd0b7
|
||||||
host->GetChildProcess()->BindServiceInterface(std::move(receiver));
|
host->GetChildProcess()->BindServiceInterface(std::move(receiver));
|
||||||
}
|
}
|
||||||
diff --git a/content/browser/service_host/utility_process_host.cc b/content/browser/service_host/utility_process_host.cc
|
diff --git a/content/browser/service_host/utility_process_host.cc b/content/browser/service_host/utility_process_host.cc
|
||||||
index 8bb497717298886bc6db04ebcba9be1f3b29ab73..60c4a301c32a46cdc332cccd1cd4ae78802ee8b9 100644
|
index 9e01e61bf1fce448a93eaa3d5f363fc835b78538..d210af6fb317c922a8415a67a7ccd1d8a4a88ea1 100644
|
||||||
--- a/content/browser/service_host/utility_process_host.cc
|
--- a/content/browser/service_host/utility_process_host.cc
|
||||||
+++ b/content/browser/service_host/utility_process_host.cc
|
+++ b/content/browser/service_host/utility_process_host.cc
|
||||||
@@ -190,11 +190,13 @@ const ChildProcessData& UtilityProcessHost::GetData() {
|
@@ -190,11 +190,13 @@ const ChildProcessData& UtilityProcessHost::GetData() {
|
||||||
|
@ -237,7 +237,7 @@ index 8bb497717298886bc6db04ebcba9be1f3b29ab73..60c4a301c32a46cdc332cccd1cd4ae78
|
||||||
mojom::ChildProcess* UtilityProcessHost::GetChildProcess() {
|
mojom::ChildProcess* UtilityProcessHost::GetChildProcess() {
|
||||||
return static_cast<ChildProcessHostImpl*>(process_->GetHost())
|
return static_cast<ChildProcessHostImpl*>(process_->GetHost())
|
||||||
->child_process();
|
->child_process();
|
||||||
@@ -455,9 +481,26 @@ bool UtilityProcessHost::StartProcess() {
|
@@ -456,9 +482,26 @@ bool UtilityProcessHost::StartProcess() {
|
||||||
}
|
}
|
||||||
#endif // BUILDFLAG(ENABLE_GPU_CHANNEL_MEDIA_CAPTURE) && !BUILDFLAG(IS_WIN)
|
#endif // BUILDFLAG(ENABLE_GPU_CHANNEL_MEDIA_CAPTURE) && !BUILDFLAG(IS_WIN)
|
||||||
|
|
||||||
|
|
|
@ -112,10 +112,10 @@ index aa3a6b93cceae8c8bfbefdd7a043ae576f921979..17544d7ed4757fb51e2f82fd1b906381
|
||||||
property_.sorting_key = (-property_.priority,
|
property_.sorting_key = (-property_.priority,
|
||||||
internal_visited_order,
|
internal_visited_order,
|
||||||
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
|
diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5
|
||||||
index b44da8add10fdeadd24653441115df035a93dd50..ce7c7bd32f3a8ea262f01c408474ff4ffe7fe0aa 100644
|
index 15ed205144fbb058bcc88953acb8380574cb7044..1795bceb2e7548c6e072c1bd2ce6abd0b3bd8188 100644
|
||||||
--- a/third_party/blink/renderer/core/css/css_properties.json5
|
--- a/third_party/blink/renderer/core/css/css_properties.json5
|
||||||
+++ b/third_party/blink/renderer/core/css/css_properties.json5
|
+++ b/third_party/blink/renderer/core/css/css_properties.json5
|
||||||
@@ -8795,6 +8795,24 @@
|
@@ -8796,6 +8796,24 @@
|
||||||
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
|
property_methods: ["ParseShorthand", "CSSValueFromComputedStyleInternal"],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -80,10 +80,10 @@ index 801db538979ba62facdcf3a472dade56723ca639..7abac9a5b13b393713534ae51664c2e5
|
||||||
private:
|
private:
|
||||||
const std::string service_interface_name_;
|
const std::string service_interface_name_;
|
||||||
diff --git a/content/browser/service_host/utility_process_host.cc b/content/browser/service_host/utility_process_host.cc
|
diff --git a/content/browser/service_host/utility_process_host.cc b/content/browser/service_host/utility_process_host.cc
|
||||||
index 60c4a301c32a46cdc332cccd1cd4ae78802ee8b9..85fc14b2ef520abb191f926dc44a272f4c9e874b 100644
|
index d210af6fb317c922a8415a67a7ccd1d8a4a88ea1..0de01879f618555030e87ea79a94d41232811c2c 100644
|
||||||
--- a/content/browser/service_host/utility_process_host.cc
|
--- a/content/browser/service_host/utility_process_host.cc
|
||||||
+++ b/content/browser/service_host/utility_process_host.cc
|
+++ b/content/browser/service_host/utility_process_host.cc
|
||||||
@@ -540,7 +540,7 @@ void UtilityProcessHost::OnProcessCrashed(int exit_code) {
|
@@ -541,7 +541,7 @@ void UtilityProcessHost::OnProcessCrashed(int exit_code) {
|
||||||
// Take ownership of |client_| so the destructor doesn't notify it of
|
// Take ownership of |client_| so the destructor doesn't notify it of
|
||||||
// termination.
|
// termination.
|
||||||
auto client = std::move(client_);
|
auto client = std::move(client_);
|
||||||
|
|
|
@ -7,7 +7,7 @@ Allows embedders to get a handle to the gdk_pixbuf
|
||||||
library already loaded in the process.
|
library already loaded in the process.
|
||||||
|
|
||||||
diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
|
diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
|
||||||
index d6ac3233de3165d2be3e5d4fb3e221dca8b8d415..4f15069af07b7adc3e3c45e67e23ec8525668c21 100644
|
index f28cf275db0205186fe6143b7e1550b6c30a4435..346992e202c507eeac454d657507e1bd336175fc 100644
|
||||||
--- a/ui/gtk/gtk_compat.cc
|
--- a/ui/gtk/gtk_compat.cc
|
||||||
+++ b/ui/gtk/gtk_compat.cc
|
+++ b/ui/gtk/gtk_compat.cc
|
||||||
@@ -69,11 +69,6 @@ void* GetLibGio() {
|
@@ -69,11 +69,6 @@ void* GetLibGio() {
|
||||||
|
|
|
@ -579,7 +579,7 @@ index 4017ee032569466f5311e5c9612c82c086eab935..f2499bc084312a09b2324567d270fc1b
|
||||||
return kAttributes;
|
return kAttributes;
|
||||||
}
|
}
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index 6655d0e6c01afc6e27045a288c65cd4cd4358094..dbebdc2cc87d7ebca0ea0388fea496108359d2c9 100644
|
index 9ed48bb42381690b8a5c1a5d3aef7f82cb59ac65..56118dba5d55a937290a1234bd1c70d4d301de25 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -340,6 +340,7 @@ source_set("browser") {
|
@@ -340,6 +340,7 @@ source_set("browser") {
|
||||||
|
|
|
@ -178,7 +178,7 @@ index f2dcec57a22d95892a08f1fa43696d6eea46a820..930e0bd987c48d111b2c8d71147c09e4
|
||||||
std::unique_ptr<HostResolver> internal_host_resolver_;
|
std::unique_ptr<HostResolver> internal_host_resolver_;
|
||||||
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
|
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
|
||||||
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
||||||
index a9c82bcf9a4ebf946791eccc35a0dcfff0c18288..6d79f4a4cb1a40be907ef52e35f0e5a0acab31fb 100644
|
index feed273c8c77d6c1e21cd82547860f945b651ae9..399d0363749e9b79749185bcc1dcd746b026231e 100644
|
||||||
--- a/services/network/public/mojom/network_context.mojom
|
--- a/services/network/public/mojom/network_context.mojom
|
||||||
+++ b/services/network/public/mojom/network_context.mojom
|
+++ b/services/network/public/mojom/network_context.mojom
|
||||||
@@ -308,6 +308,17 @@ struct SocketBrokerRemotes {
|
@@ -308,6 +308,17 @@ struct SocketBrokerRemotes {
|
||||||
|
|
|
@ -10,7 +10,7 @@ an about:blank check to this area.
|
||||||
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index f3ea037e823cca68c1bd471d3f7d6566e35d232a..3737f0b72242c94a18a41f32cc7fab98de62e53b 100644
|
index 6372615eecc862325e88ebb9b189d380459163c7..38e360457b2fcb658db8c94fe26169a3f61a9cbc 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -808,8 +808,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
@@ -808,8 +808,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
||||||
|
|
|
@ -881,10 +881,10 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b
|
||||||
ScriptingThrottler scripting_throttler_;
|
ScriptingThrottler scripting_throttler_;
|
||||||
|
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index dbebdc2cc87d7ebca0ea0388fea496108359d2c9..900b563fef7e97676097806a59bc2633026f852f 100644
|
index 56118dba5d55a937290a1234bd1c70d4d301de25..2086718aba634ffed079c108b04cdd7993133961 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -3137,8 +3137,9 @@ source_set("browser") {
|
@@ -3139,8 +3139,9 @@ source_set("browser") {
|
||||||
"//ppapi/shared_impl",
|
"//ppapi/shared_impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ Note that we also need to manually update embedder's
|
||||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
`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
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 71fbe83a33fa247f82d7315767ff9a4aee9d3fca..f3ea037e823cca68c1bd471d3f7d6566e35d232a 100644
|
index 57a450929264e3f7592b5eab5126d176dbff8a58..6372615eecc862325e88ebb9b189d380459163c7 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -8754,6 +8754,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -8754,6 +8754,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue