mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: tidy up usage of PendingRemote (#26176)

Browse source
This commit is contained in:
David Sanders 2020-10-27 12:20:41 -07:00 • committed by GitHub
parent 430cef8a62
commit 98b0ccbdb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shell/browser/net/electron_url_loader_factory.cc
View file

@ -213,9 +213,11 @@ void ElectronURLLoaderFactory::OnComplete(
mojo::PendingRemote<network::mojom::URLLoaderClient> client,
int32_t request_id,
const network::URLLoaderCompletionStatus& status) {
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
std::move(client));
client_remote->OnComplete(status);
if (client.is_valid()) {
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
std::move(client));
client_remote->OnComplete(status);
}
}
// static
@ -294,14 +296,13 @@ void ElectronURLLoaderFactory::StartLoading(
// module.
//
// I'm not sure whether this is an intended behavior in Chromium.
mojo::Remote<network::mojom::URLLoaderFactory> proxy_factory_remote(
std::move(proxy_factory));
if (proxy_factory.is_valid()) {
mojo::Remote<network::mojom::URLLoaderFactory> proxy_factory_remote(
std::move(proxy_factory));
if (proxy_factory_remote.is_bound()) {
proxy_factory_remote->CreateLoaderAndStart(
std::move(loader), routing_id, request_id, options, new_request,
std::move(client), traffic_annotation);
proxy_factory = proxy_factory_remote.Unbind();
} else {
StartLoadingHttp(std::move(loader), new_request, std::move(client),
traffic_annotation,