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

feat: associate InProgressRequest with requests (#19648)

Browse source
This commit is contained in:
Cheng Zhao 2019-08-07 09:21:53 +09:00 • committed by GitHub
parent 50cc54e50b
commit 761a4deab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/browser/net/proxying_url_loader_factory.h
View file

@ -5,6 +5,7 @@
#ifndef SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
#define SHELL_BROWSER_NET_PROXYING_URL_LOADER_FACTORY_H_
#include <map>
#include <memory>
#include <set>
#include <string>
@ -35,6 +36,7 @@ class ProxyingURLLoaderFactory
public:
InProgressRequest(
ProxyingURLLoaderFactory* factory,
int64_t web_request_id,
int32_t routing_id,
int32_t network_service_request_id,
uint32_t options,
@ -98,6 +100,7 @@ class ProxyingURLLoaderFactory
ProxyingURLLoaderFactory* factory_;
network::ResourceRequest request_;
const base::Optional<url::Origin> original_initiator_;
const uint64_t request_id_;
const int32_t routing_id_;
const int32_t network_service_request_id_;
const uint32_t options_;
@ -173,6 +176,8 @@ class ProxyingURLLoaderFactory
private:
void OnTargetFactoryError();
void OnProxyBindingError();
void RemoveRequest(int32_t network_service_request_id, uint64_t request_id);
void MaybeDeleteThis();
// This is passed from api::ProtocolNS.
//
@ -188,6 +193,14 @@ class ProxyingURLLoaderFactory
mojo::Binding<network::mojom::TrustedURLLoaderHeaderClient>
url_loader_header_client_binding_;
// Mapping from our own internally generated request ID to an
// InProgressRequest instance.
std::map<uint64_t, std::unique_ptr<InProgressRequest>> requests_;
// A mapping from the network stack's notion of request ID to our own
// internally generated request ID for the same request.
std::map<int32_t, uint64_t> network_request_id_to_web_request_id_;
DISALLOW_COPY_AND_ASSIGN(ProxyingURLLoaderFactory);
};