mirror of
https://github.com/electron/electron.git
synced 2026-01-10 07:58:08 -05:00
chore: bump chromium to 123.0.6272.0 (main) (#41130)
* chore: bump chromium in DEPS to 123.0.6265.0
* chore: bump chromium in DEPS to 123.0.6266.0
* chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280
reverts the revert *and* undoes the rewrites 😵
* chore: update chromium/disable_hidden.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
minor manual intervention
* chore: update patches
* chore: Rename mouse lock to pointer lock
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
* refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351
Xref: https://github.com/electron/electron/pull/26022
This usage was added in #26022 as part of Wayland support and some
simple fiddles WfM with this patch on Wayland, but I'm unsure what
to be testing for & would like a second opinion on this commit.
* chore: bump chromium in DEPS to 123.0.6268.0
* chore: update patches
* 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig
https://chromium-review.googlesource.com/c/chromium/src/+/5235021
* address review comment for 5196547
See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547
Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786
* 5075962: Introduce URLLoaderFactoryBuilder
https://chromium-review.googlesource.com/c/chromium/src/+/5075962
* chore: bump chromium in DEPS to 123.0.6270.0
* the missing semicolon strikes again
* chore: update chromium patches
* chore: update v8 patches
* 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326
* chore: bump chromium in DEPS to 123.0.6272.0
* chore: update patches
* chore: update patch after rebase
* 5247339: [Clipboard] Remove ClipboardContentType enum.
https://chromium-review.googlesource.com/c/chromium/src/+/5247339
* Reland: "Allow content shell to enable the built-in DNS resolver"
https://chromium-review.googlesource.com/c/chromium/src/+/5232354
* 5018206: [accessibility] Migrate to ScopedAccessibilityMode
https://chromium-review.googlesource.com/c/chromium/src/+/5018206
* 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669
* fix: move nut-js to optional spec deps (#41199)
* chore: bump chromium in DEPS to 123.0.6265.0
* chore: bump chromium in DEPS to 123.0.6266.0
* chore: update feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5232280
reverts the revert *and* undoes the rewrites 😵
* chore: update chromium/disable_hidden.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
minor manual intervention
* chore: update patches
* chore: Rename mouse lock to pointer lock
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5148491
* refactor: fix use of newly-removed QuitCurrentWhenIdleClosureDeprecated()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4710351
Xref: https://github.com/electron/electron/pull/26022
This usage was added in #26022 as part of Wayland support and some
simple fiddles WfM with this patch on Wayland, but I'm unsure what
to be testing for & would like a second opinion on this commit.
* chore: bump chromium in DEPS to 123.0.6268.0
* chore: update patches
* 5235021: WebUI: Migrate accessibility and bluetooth internals to WebUIConfig
https://chromium-review.googlesource.com/c/chromium/src/+/5235021
* address review comment for 5196547
See: https://chromium-review.googlesource.com/c/chromium/src/+/5196547
Review comment: https://github.com/electron/electron/pull/41130#discussion_r1468973786
* 5075962: Introduce URLLoaderFactoryBuilder
https://chromium-review.googlesource.com/c/chromium/src/+/5075962
* chore: bump chromium in DEPS to 123.0.6270.0
* the missing semicolon strikes again
* chore: update chromium patches
* chore: update v8 patches
* 5242326: Some followup cleanup to Fuchia files in chrome | https://chromium-review.googlesource.com/c/chromium/src/+/5242326
* chore: bump chromium in DEPS to 123.0.6272.0
* chore: update patches
* chore: update patch after rebase
* 5247339: [Clipboard] Remove ClipboardContentType enum.
https://chromium-review.googlesource.com/c/chromium/src/+/5247339
* Reland: "Allow content shell to enable the built-in DNS resolver"
https://chromium-review.googlesource.com/c/chromium/src/+/5232354
* 5018206: [accessibility] Migrate to ScopedAccessibilityMode
https://chromium-review.googlesource.com/c/chromium/src/+/5018206
* 5246669: [Default Nav Transition]Add GetBackForwardTransitionAnimationManager on WebContentsView | https://chromium-review.googlesource.com/c/chromium/src/+/5246669
* fix: typescript error for optional dependency
(cherry picked from commit ea17105c8c)
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Sam Maddock <smaddock@slack-corp.com>
This commit is contained in:
electron-roller[bot]
committed by
GitHub
GitHub
parent
12870cafb7
commit
bccb7b572a
@@ -71,6 +71,7 @@
|
||||
#include "services/network/public/cpp/network_switches.h"
|
||||
#include "services/network/public/cpp/resource_request_body.h"
|
||||
#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
|
||||
#include "services/network/public/cpp/url_loader_factory_builder.h"
|
||||
#include "shell/app/electron_crash_reporter_client.h"
|
||||
#include "shell/browser/api/electron_api_app.h"
|
||||
#include "shell/browser/api/electron_api_crash_reporter.h"
|
||||
@@ -1294,7 +1295,7 @@ void ElectronBrowserClient::CreateWebSocket(
|
||||
&next_id_);
|
||||
}
|
||||
|
||||
bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
void ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
content::BrowserContext* browser_context,
|
||||
content::RenderFrameHost* frame_host,
|
||||
int render_process_id,
|
||||
@@ -1302,7 +1303,7 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
const url::Origin& request_initiator,
|
||||
std::optional<int64_t> navigation_id,
|
||||
ukm::SourceIdObj ukm_source_id,
|
||||
mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
|
||||
network::URLLoaderFactoryBuilder& factory_builder,
|
||||
mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
|
||||
header_client,
|
||||
bool* bypass_redirect_checks,
|
||||
@@ -1320,22 +1321,20 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
extensions::WebRequestAPI>::Get(browser_context);
|
||||
|
||||
DCHECK(web_request_api);
|
||||
bool use_proxy_for_web_request =
|
||||
bool used_proxy_for_web_request =
|
||||
web_request_api->MaybeProxyURLLoaderFactory(
|
||||
browser_context, frame_host, render_process_id, type, navigation_id,
|
||||
ukm_source_id, factory_receiver, header_client,
|
||||
ukm_source_id, factory_builder, header_client,
|
||||
navigation_response_task_runner);
|
||||
|
||||
if (bypass_redirect_checks)
|
||||
*bypass_redirect_checks = use_proxy_for_web_request;
|
||||
if (use_proxy_for_web_request)
|
||||
return true;
|
||||
*bypass_redirect_checks = used_proxy_for_web_request;
|
||||
if (used_proxy_for_web_request)
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
auto proxied_receiver = std::move(*factory_receiver);
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote;
|
||||
*factory_receiver = target_factory_remote.InitWithNewPipeAndPassReceiver();
|
||||
auto [proxied_receiver, target_factory_remote] = factory_builder.Append();
|
||||
|
||||
// Required by WebRequestInfoInitParams.
|
||||
//
|
||||
@@ -1362,8 +1361,6 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
std::move(navigation_ui_data), std::move(navigation_id),
|
||||
std::move(proxied_receiver), std::move(target_factory_remote),
|
||||
std::move(header_client_receiver), type);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||
|
||||
Reference in New Issue
Block a user