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

chore: migrate base::StringPiece to std::string_view (#40915)

Browse source 
* chore: migrate from base::StringPiece to std::string_view in keyboard_util.cc

* chore: migrate from base::StringPiece to std::string_view in error_thrower.cc

* chore: migrate from base::StringPiece to std::string_view in electron_api_web_contents.cc

* chore: migrate from base::StringPiece to std::string_view in gin_helper/dictionary.h

* chore: migrate from base::StringPiece to std::string_view in electron_api_url_loader.cc

* chore: phase out internal use of base:::StringPiece

`base::StringPiece` is being phased out upstream. Its code has been
removed upstream and it's just a typedef for `std::string_view`.

They haven't removed the typedef yet, so this PR tries to get ahead
of future breakage by migrating "internal" use (i.e. leaving alone the
places where the `base::StringPiece` name is coming from an upstream
method that we override).

Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=691162

Xref: 4294483

Xref: https://docs.google.com/document/d/1d4RnD1uAE2t4iANR0nXy82ASIPGsPuw2mpO6v6T7JKs
This commit is contained in:
Charles Kerr 2024-01-10 19:00:37 -06:00 • committed by GitHub
parent 892c9d78a3
commit f36ceae024
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 223 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

38
shell/common/gin_converters/net_converter.cc
View file

@ -5,6 +5,7 @@
#include "shell/common/gin_converters/net_converter.h"
#include <string>
#include <string_view>
#include <utility>
#include <vector>
@ -691,7 +692,7 @@ bool Converter<net::DnsQueryType>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
net::DnsQueryType* out) {
static constexpr auto Lookup =
base::MakeFixedFlatMap<base::StringPiece, net::DnsQueryType>({
base::MakeFixedFlatMap<std::string_view, net::DnsQueryType>({
{"A", net::DnsQueryType::A},
{"AAAA", net::DnsQueryType::AAAA},
});
@ -703,14 +704,13 @@ bool Converter<net::HostResolverSource>::FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
net::HostResolverSource* out) {
using Val = net::HostResolverSource;
static constexpr auto Lookup =
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"any", Val::ANY},
{"dns", Val::DNS},
{"localOnly", Val::LOCAL_ONLY},
{"mdns", Val::MULTICAST_DNS},
{"system", Val::SYSTEM},
});
static constexpr auto Lookup = base::MakeFixedFlatMap<std::string_view, Val>({
{"any", Val::ANY},
{"dns", Val::DNS},
{"localOnly", Val::LOCAL_ONLY},
{"mdns", Val::MULTICAST_DNS},
{"system", Val::SYSTEM},
});
return FromV8WithLookup(isolate, val, Lookup, out);
}
@ -720,12 +720,11 @@ bool Converter<network::mojom::ResolveHostParameters::CacheUsage>::FromV8(
v8::Local<v8::Value> val,
network::mojom::ResolveHostParameters::CacheUsage* out) {
using Val = network::mojom::ResolveHostParameters::CacheUsage;
static constexpr auto Lookup =
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"allowed", Val::ALLOWED},
{"disallowed", Val::DISALLOWED},
{"staleAllowed", Val::STALE_ALLOWED},
});
static constexpr auto Lookup = base::MakeFixedFlatMap<std::string_view, Val>({
{"allowed", Val::ALLOWED},
{"disallowed", Val::DISALLOWED},
{"staleAllowed", Val::STALE_ALLOWED},
});
return FromV8WithLookup(isolate, val, Lookup, out);
}
@ -735,11 +734,10 @@ bool Converter<network::mojom::SecureDnsPolicy>::FromV8(
v8::Local<v8::Value> val,
network::mojom::SecureDnsPolicy* out) {
using Val = network::mojom::SecureDnsPolicy;
static constexpr auto Lookup =
base::MakeFixedFlatMap<base::StringPiece, Val>({
{"allow", Val::ALLOW},
{"disable", Val::DISABLE},
});
static constexpr auto Lookup = base::MakeFixedFlatMap<std::string_view, Val>({
{"allow", Val::ALLOW},
{"disable", Val::DISABLE},
});
return FromV8WithLookup(isolate, val, Lookup, out);
}