github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use std::map::extract() in api::WebRequest (#48929)

Browse Source 
refactor: use std::map::extract() in api::WebRequest

Small readability refactor to api::WebRequest::blocked_requests_:
use extract() when we want to pull a BlockedRequest from the map
and then process it.
This commit is contained in:
Charles Kerr
2025-11-13 15:50:13 -06:00
committed by GitHub
parent c896ab80fe
commit 16f1ec9001
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
shell/browser/api/electron_api_web_request.cc
View File

@@ -402,11 +402,11 @@ int WebRequest::HandleOnBeforeRequestResponseEvent(
void WebRequest::OnBeforeRequestListenerResult(uint64_t id,
v8::Local<v8::Value> response) {
const auto iter = blocked_requests_.find(id);
if (iter == std::end(blocked_requests_))
auto nh = blocked_requests_.extract(id);
if (!nh)
return;
auto& request = iter->second;
auto& request = nh.mapped();
int result = net::OK;
if (response->IsObject()) {
@@ -424,7 +424,6 @@ void WebRequest::OnBeforeRequestListenerResult(uint64_t id,
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, base::BindOnce(std::move(request.callback), result));
blocked_requests_.erase(iter);
}
int WebRequest::OnBeforeSendHeaders(extensions::WebRequestInfo* info,
@@ -469,11 +468,11 @@ int WebRequest::HandleOnBeforeSendHeadersResponseEvent(
void WebRequest::OnBeforeSendHeadersListenerResult(
uint64_t id,
v8::Local<v8::Value> response) {
const auto iter = blocked_requests_.find(id);
if (iter == std::end(blocked_requests_))
auto nh = blocked_requests_.extract(id);
if (!nh)
return;
auto& request = iter->second;
auto& request = nh.mapped();
net::HttpRequestHeaders* old_headers = request.request_headers;
net::HttpRequestHeaders new_headers;
@@ -511,7 +510,6 @@ void WebRequest::OnBeforeSendHeadersListenerResult(
FROM_HERE,
base::BindOnce(std::move(request.before_send_headers_callback),
updated_headers.first, updated_headers.second, result));
blocked_requests_.erase(iter);
}
int WebRequest::OnHeadersReceived(
@@ -563,11 +561,11 @@ int WebRequest::HandleOnHeadersReceivedResponseEvent(
void WebRequest::OnHeadersReceivedListenerResult(
uint64_t id,
v8::Local<v8::Value> response) {
const auto iter = blocked_requests_.find(id);
if (iter == std::end(blocked_requests_))
auto nh = blocked_requests_.extract(id);
if (!nh)
return;
auto& request = iter->second;
auto& request = nh.mapped();
int result = net::OK;
bool user_modified_headers = false;
@@ -600,7 +598,6 @@ void WebRequest::OnHeadersReceivedListenerResult(
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, base::BindOnce(std::move(request.callback), result));
blocked_requests_.erase(iter);
}
void WebRequest::OnSendHeaders(extensions::WebRequestInfo* info,
@@ -772,9 +769,8 @@ void WebRequest::OnLoginAuthResult(
uint64_t id,
net::AuthCredentials* credentials,
const std::optional<net::AuthCredentials>& maybe_creds) {
auto iter = blocked_requests_.find(id);
if (iter == blocked_requests_.end())
NOTREACHED();
auto nh = blocked_requests_.extract(id);
CHECK(nh);
AuthRequiredResponse action =
AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION;
@@ -784,8 +780,7 @@ void WebRequest::OnLoginAuthResult(
}
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
FROM_HERE, base::BindOnce(std::move(iter->second.auth_callback), action));
blocked_requests_.erase(iter);
FROM_HERE, base::BindOnce(std::move(nh.mapped().auth_callback), action));
}
// static