mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 102.0.4971.0 (19-x-y) (#33518)
* chore: bump chromium in DEPS to 102.0.4973.0
* chore: bump chromium to 102.0.4971.0 (main) (#33454)
* chore: bump chromium in DEPS to 102.0.4965.0
* chore: 3-way merge of chromium/printing.patch
* chore: update patch shear in chromium/picture-in-picture.patch
* chore: update patches
* 3101519: Window Placement: Prototype fullscreen companion window support
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3101519
build: add popup_preventer.cc, .h to our library. It's needed because
FullscreenController, we were already using, started aggregating a
PopupPreventer in 3101519.
* chore: bump chromium in DEPS to 102.0.4967.0
* Revert "3101519: Window Placement: Prototype fullscreen companion window support"
This reverts commit fc215cb99c464e939882ed3f5cf8e9874a8e3311.
Adding popup_preventer might not be the right solution; there are
cascading dependencies.
* 3551449: Add service-based usage for system print settings
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3551449
chore: fix code shear in patches/chromium/printing.patch
* chore: update patches
* chore: bump chromium in DEPS to 102.0.4969.0
* chore: update patches
* chore: bump chromium in DEPS to 102.0.4971.0
* chore: update fix_patch_out_permissions_checks_in_exclusive_access.patch
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3101519
PopupunderPreventer is not useful in //electron since the window
attributes are controlled by the user via setWindowOpenHandler.
* chore: update patches
* Add FirstPartySetsHandler as a interface class in content API.
https://chromium-review.googlesource.com/c/chromium/src/+/3503410
* Create a new MediaStreamRequestType for GetOpenDevice
https://chromium-review.googlesource.com/c/chromium/src/+/3541939
* Support site isolation for <webview> tags in WebViewRendererState.
https://chromium-review.googlesource.com/c/chromium/src/+/3537735
* ci: update xcode version
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3544199
https://developer.apple.com/documentation/screencapturekit/capturing_screen_content_in_macos
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: deepak1556 <hop2deep@gmail.com>
(cherry picked from commit b711860d21)
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
9a8985f7a2
commit
6442e87276
@@ -164,8 +164,8 @@ void ToDictionary(gin_helper::Dictionary* details,
|
||||
HttpResponseHeadersToV8(info->response_headers.get()));
|
||||
}
|
||||
|
||||
auto* render_frame_host =
|
||||
content::RenderFrameHost::FromID(info->render_process_id, info->frame_id);
|
||||
auto* render_frame_host = content::RenderFrameHost::FromID(
|
||||
info->render_process_id, info->frame_routing_id);
|
||||
if (render_frame_host) {
|
||||
details->SetGetter("frame", render_frame_host);
|
||||
auto* web_contents =
|
||||
|
||||
@@ -1478,10 +1478,8 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||
new ProxyingURLLoaderFactory(
|
||||
web_request.get(), protocol_registry->intercept_handlers(),
|
||||
render_process_id,
|
||||
frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE,
|
||||
frame_host ? frame_host->GetRenderViewHost()->GetRoutingID()
|
||||
: MSG_ROUTING_NONE,
|
||||
&next_id_, std::move(navigation_ui_data), std::move(navigation_id),
|
||||
frame_host ? frame_host->GetRoutingID() : MSG_ROUTING_NONE, &next_id_,
|
||||
std::move(navigation_ui_data), std::move(navigation_id),
|
||||
std::move(proxied_receiver), std::move(target_factory_remote),
|
||||
std::move(header_client_receiver), type);
|
||||
|
||||
|
||||
@@ -152,6 +152,13 @@ void MediaStreamDevicesController::Accept() {
|
||||
NOTREACHED();
|
||||
break;
|
||||
}
|
||||
case blink::MEDIA_GET_OPEN_DEVICE: {
|
||||
// Transferred tracks, that use blink::MEDIA_GET_OPEN_DEVICE type, do
|
||||
// not need to get permissions for MediaStreamDevice as those are
|
||||
// controlled by the original context.
|
||||
NOTREACHED();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ ProxyingURLLoaderFactory::InProgressRequest::FollowRedirectParams::
|
||||
ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest(
|
||||
ProxyingURLLoaderFactory* factory,
|
||||
uint64_t web_request_id,
|
||||
int32_t view_routing_id,
|
||||
int32_t frame_routing_id,
|
||||
int32_t network_service_request_id,
|
||||
uint32_t options,
|
||||
@@ -51,7 +50,6 @@ ProxyingURLLoaderFactory::InProgressRequest::InProgressRequest(
|
||||
original_initiator_(request.request_initiator),
|
||||
request_id_(web_request_id),
|
||||
network_service_request_id_(network_service_request_id),
|
||||
view_routing_id_(view_routing_id),
|
||||
frame_routing_id_(frame_routing_id),
|
||||
options_(options),
|
||||
traffic_annotation_(traffic_annotation),
|
||||
@@ -120,7 +118,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::UpdateRequestInfo() {
|
||||
request_id_, factory_->render_process_id_, frame_routing_id_,
|
||||
factory_->navigation_ui_data_ ? factory_->navigation_ui_data_->DeepCopy()
|
||||
: nullptr,
|
||||
view_routing_id_, request_for_info, false,
|
||||
request_for_info, false,
|
||||
!(options_ & network::mojom::kURLLoadOptionSynchronous),
|
||||
factory_->IsForServiceWorkerScript(), factory_->navigation_id_,
|
||||
ukm::kInvalidSourceIdObj));
|
||||
@@ -757,7 +755,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
|
||||
const HandlersMap& intercepted_handlers,
|
||||
int render_process_id,
|
||||
int frame_routing_id,
|
||||
int view_routing_id,
|
||||
uint64_t* request_id_generator,
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
|
||||
absl::optional<int64_t> navigation_id,
|
||||
@@ -770,7 +767,6 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
|
||||
intercepted_handlers_(intercepted_handlers),
|
||||
render_process_id_(render_process_id),
|
||||
frame_routing_id_(frame_routing_id),
|
||||
view_routing_id_(view_routing_id),
|
||||
request_id_generator_(request_id_generator),
|
||||
navigation_ui_data_(std::move(navigation_ui_data)),
|
||||
navigation_id_(std::move(navigation_id)),
|
||||
@@ -866,9 +862,8 @@ void ProxyingURLLoaderFactory::CreateLoaderAndStart(
|
||||
auto result = requests_.emplace(
|
||||
web_request_id,
|
||||
std::make_unique<InProgressRequest>(
|
||||
this, web_request_id, view_routing_id_, frame_routing_id_, request_id,
|
||||
options, request, traffic_annotation, std::move(loader),
|
||||
std::move(client)));
|
||||
this, web_request_id, frame_routing_id_, request_id, options, request,
|
||||
traffic_annotation, std::move(loader), std::move(client)));
|
||||
result.first->second->Restart();
|
||||
}
|
||||
|
||||
|
||||
@@ -54,7 +54,6 @@ class ProxyingURLLoaderFactory
|
||||
InProgressRequest(
|
||||
ProxyingURLLoaderFactory* factory,
|
||||
uint64_t web_request_id,
|
||||
int32_t view_routing_id,
|
||||
int32_t frame_routing_id,
|
||||
int32_t network_service_request_id,
|
||||
uint32_t options,
|
||||
@@ -136,7 +135,6 @@ class ProxyingURLLoaderFactory
|
||||
const absl::optional<url::Origin> original_initiator_;
|
||||
const uint64_t request_id_ = 0;
|
||||
const int32_t network_service_request_id_ = 0;
|
||||
const int32_t view_routing_id_ = MSG_ROUTING_NONE;
|
||||
const int32_t frame_routing_id_ = MSG_ROUTING_NONE;
|
||||
const uint32_t options_ = 0;
|
||||
const net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
|
||||
@@ -195,7 +193,6 @@ class ProxyingURLLoaderFactory
|
||||
const HandlersMap& intercepted_handlers,
|
||||
int render_process_id,
|
||||
int frame_routing_id,
|
||||
int view_routing_id,
|
||||
uint64_t* request_id_generator,
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
|
||||
absl::optional<int64_t> navigation_id,
|
||||
@@ -260,7 +257,6 @@ class ProxyingURLLoaderFactory
|
||||
|
||||
const int render_process_id_;
|
||||
const int frame_routing_id_;
|
||||
const int view_routing_id_;
|
||||
uint64_t* request_id_generator_; // managed by ElectronBrowserClient
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data_;
|
||||
absl::optional<int64_t> navigation_id_;
|
||||
|
||||
@@ -40,7 +40,6 @@ ProxyingWebSocket::ProxyingWebSocket(
|
||||
process_id,
|
||||
render_frame_id,
|
||||
nullptr,
|
||||
MSG_ROUTING_NONE,
|
||||
request,
|
||||
/*is_download=*/false,
|
||||
/*is_async=*/true,
|
||||
|
||||
@@ -288,10 +288,6 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
|
||||
base::FeatureList::IsEnabled(features::kAsyncDns),
|
||||
default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
|
||||
|
||||
// Initializes first party sets component
|
||||
// CL: https://chromium-review.googlesource.com/c/chromium/src/+/3449280
|
||||
content::GetNetworkService()->SetFirstPartySets(base::File());
|
||||
|
||||
std::string app_name = electron::Browser::Get()->GetName();
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
KeychainPassword::GetServiceName() = app_name + " Safe Storage";
|
||||
|
||||
Reference in New Issue
Block a user