Skip to content

Commit

Permalink
chore: bump chromium to 104.0.5112.65 (20-x-y) (#35114)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 104.0.5112.65

* chore: update patches

* test: remove duplicate test that is causing hang in Windows (#35071)

(cherry picked from commit 182ab9a)

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
  • Loading branch information
3 people committed Jul 28, 2022
1 parent 816e8e8 commit 2f9414d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'104.0.5112.57',
'104.0.5112.65',
'node_version':
'v16.15.0',
'nan_version':
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/can_create_window.patch
Expand Up @@ -9,10 +9,10 @@ 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 b857d325233430a5b79b3022d33823486e558309..83cc6ded4b3354f37b8e1dc0d9e4f3289863fa09 100644
index 28c7136b21d058e3daa7570af558f5a415b000a7..d1b7d15a7e4dede5b030e4ae9fb2ab8aa8196446 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6966,6 +6966,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -7006,6 +7006,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/expose_setuseragent_on_networkcontext.patch
Expand Up @@ -33,10 +33,10 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3

} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index b8560d71365759680fd5e49d311b19df41d6fb3b..1c0451cd2f2f7e1aeb182fb4f803cb960b63ef63 100644
index c90733c3f463a2b9a3f142a739061fa65d6905b8..372c00c77c4320847313bdba49ade7ae8ed3f699 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1412,6 +1412,13 @@ void NetworkContext::SetNetworkConditions(
@@ -1414,6 +1414,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}

Expand Down
Expand Up @@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.

diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 89bbba4956965fda7743f122d05fb5dfc3862e72..b8560d71365759680fd5e49d311b19df41d6fb3b 100644
index 13fc1b901b7b356836024c79db99ac2f3da431c9..c90733c3f463a2b9a3f142a739061fa65d6905b8 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -128,6 +128,11 @@
Expand Down Expand Up @@ -128,7 +128,7 @@ index 89bbba4956965fda7743f122d05fb5dfc3862e72..b8560d71365759680fd5e49d311b19df
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2307,6 +2404,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2309,6 +2406,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
std::move(cert_verifier));
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_);
#endif // BUILDFLAG(IS_CHROMEOS)
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/webview_fullscreen.patch
Expand Up @@ -14,10 +14,10 @@ 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 83cc6ded4b3354f37b8e1dc0d9e4f3289863fa09..269a7b63c8afa14fbf3b48de020c89ea22f50a83 100644
index d1b7d15a7e4dede5b030e4ae9fb2ab8aa8196446..3b14fdd3664970072f173ca494ccb924f4d55fff 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6325,6 +6325,15 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6365,6 +6365,15 @@ void RenderFrameHostImpl::EnterFullscreen(
notified_instances.insert(parent_site_instance);
}

Expand Down
8 changes: 0 additions & 8 deletions spec/chromium-spec.js
Expand Up @@ -63,14 +63,6 @@ describe('chromium feature', () => {
});

describe('window.open', () => {
it('accepts "nodeIntegration" as feature', async () => {
const message = waitForEvent(window, 'message');
const b = window.open(`file://${fixtures}/pages/window-opener-node.html`, '', 'nodeIntegration=no,show=no');
const event = await message;
b.close();
expect(event.data.isProcessGlobalUndefined).to.be.true();
});

it('inherit options of parent window', async () => {
const message = waitForEvent(window, 'message');
const b = window.open(`file://${fixtures}/pages/window-open-size.html`, '', 'show=no');
Expand Down

0 comments on commit 2f9414d

Please sign in to comment.