refactor: return-braced-init-list pt 2 of 2 (#44870)

* refactor: more return-braced-init-list, this time for v8 and gin objects

* refactor: more return-braced-init-list, this time for v8, gin, std, and base objects
This commit is contained in:
Charles Kerr 2024-11-29 11:44:33 -06:00 committed by GitHub
parent 4a695d07c6
commit f7e823ac80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 64 additions and 64 deletions

View file

@ -188,7 +188,7 @@ gin::Handle<DataPipeHolder> DataPipeHolder::From(v8::Isolate* isolate,
if (gin::ConvertFromV8(isolate, object.ToLocalChecked(), &handle)) if (gin::ConvertFromV8(isolate, object.ToLocalChecked(), &handle))
return handle; return handle;
} }
return gin::Handle<DataPipeHolder>(); return {};
} }
} // namespace electron::api } // namespace electron::api

View file

@ -209,7 +209,7 @@ const GURL& DownloadItem::GetURL() const {
v8::Local<v8::Value> DownloadItem::GetURLChain() const { v8::Local<v8::Value> DownloadItem::GetURLChain() const {
if (!CheckAlive()) if (!CheckAlive())
return v8::Local<v8::Value>(); return {};
return gin::ConvertToV8(isolate_, download_item_->GetUrlChain()); return gin::ConvertToV8(isolate_, download_item_->GetUrlChain());
} }

View file

@ -81,7 +81,7 @@ gin::Handle<Notification> Notification::New(gin_helper::ErrorThrower thrower,
gin::Arguments* args) { gin::Arguments* args) {
if (!Browser::Get()->is_ready()) { if (!Browser::Get()->is_ready()) {
thrower.ThrowError("Cannot create Notification before app is ready"); thrower.ThrowError("Cannot create Notification before app is ready");
return gin::Handle<Notification>(); return {};
} }
return gin::CreateHandle(thrower.isolate(), new Notification(args)); return gin::CreateHandle(thrower.isolate(), new Notification(args));
} }

View file

@ -301,7 +301,7 @@ gin::Handle<Protocol> Protocol::Create(
// static // static
gin::Handle<Protocol> Protocol::New(gin_helper::ErrorThrower thrower) { gin::Handle<Protocol> Protocol::New(gin_helper::ErrorThrower thrower) {
thrower.ThrowError("Protocol cannot be created from JS"); thrower.ThrowError("Protocol cannot be created from JS");
return gin::Handle<Protocol>(); return {};
} }
// static // static

View file

@ -132,7 +132,7 @@ v8::Local<v8::Value> ServiceWorkerContext::GetWorkerInfoFromID(
auto iter = info_map.find(version_id); auto iter = info_map.find(version_id);
if (iter == info_map.end()) { if (iter == info_map.end()) {
thrower.ThrowError("Could not find service worker with that version_id"); thrower.ThrowError("Could not find service worker with that version_id");
return v8::Local<v8::Value>(); return {};
} }
return ServiceWorkerRunningInfoToDict(thrower.isolate(), return ServiceWorkerRunningInfoToDict(thrower.isolate(),
std::move(iter->second)); std::move(iter->second));

View file

@ -1583,7 +1583,7 @@ std::optional<gin::Handle<Session>> Session::FromPath(
gin::Handle<Session> Session::New() { gin::Handle<Session> Session::New() {
gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate()) gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
.ThrowError("Session objects cannot be created with 'new'"); .ThrowError("Session objects cannot be created with 'new'");
return gin::Handle<Session>(); return {};
} }
void Session::FillObjectTemplate(v8::Isolate* isolate, void Session::FillObjectTemplate(v8::Isolate* isolate,

View file

@ -154,7 +154,7 @@ std::string SystemPreferences::GetMediaAccessStatus(
DeviceAccessStatus::DeviceAccessStatus_Allowed); DeviceAccessStatus::DeviceAccessStatus_Allowed);
} else { } else {
thrower.ThrowError("Invalid media type"); thrower.ThrowError("Invalid media type");
return std::string(); return {};
} }
} }

View file

@ -415,7 +415,7 @@ gin::Handle<UtilityProcessWrapper> UtilityProcessWrapper::Create(
gin_helper::Dictionary dict; gin_helper::Dictionary dict;
if (!args->GetNext(&dict)) { if (!args->GetNext(&dict)) {
args->ThrowTypeError("Options must be an object."); args->ThrowTypeError("Options must be an object.");
return gin::Handle<UtilityProcessWrapper>(); return {};
} }
std::u16string display_name; std::u16string display_name;
@ -429,19 +429,19 @@ gin::Handle<UtilityProcessWrapper> UtilityProcessWrapper::Create(
dict.Get("modulePath", &params->script); dict.Get("modulePath", &params->script);
if (dict.Has("args") && !dict.Get("args", &params->args)) { if (dict.Has("args") && !dict.Get("args", &params->args)) {
args->ThrowTypeError("Invalid value for args"); args->ThrowTypeError("Invalid value for args");
return gin::Handle<UtilityProcessWrapper>(); return {};
} }
gin_helper::Dictionary opts; gin_helper::Dictionary opts;
if (dict.Get("options", &opts)) { if (dict.Get("options", &opts)) {
if (opts.Has("env") && !opts.Get("env", &env_map)) { if (opts.Has("env") && !opts.Get("env", &env_map)) {
args->ThrowTypeError("Invalid value for env"); args->ThrowTypeError("Invalid value for env");
return gin::Handle<UtilityProcessWrapper>(); return {};
} }
if (opts.Has("execArgv") && !opts.Get("execArgv", &params->exec_args)) { if (opts.Has("execArgv") && !opts.Get("execArgv", &params->exec_args)) {
args->ThrowTypeError("Invalid value for execArgv"); args->ThrowTypeError("Invalid value for execArgv");
return gin::Handle<UtilityProcessWrapper>(); return {};
} }
opts.Get("serviceName", &display_name); opts.Get("serviceName", &display_name);

View file

@ -429,7 +429,7 @@ gin::Handle<View> View::Create(v8::Isolate* isolate) {
if (gin::ConvertFromV8(isolate, obj, &view)) if (gin::ConvertFromV8(isolate, obj, &view))
return view; return view;
} }
return gin::Handle<View>(); return {};
} }
// static // static

View file

@ -2005,7 +2005,7 @@ gin::Handle<gin_helper::internal::Event> WebContents::MakeEventWithSender(
ReplyChannel::Create(isolate, std::move(callback)) ReplyChannel::Create(isolate, std::move(callback))
->SendError("WebContents was destroyed"); ->SendError("WebContents was destroyed");
} }
return gin::Handle<gin_helper::internal::Event>(); return {};
} }
gin::Handle<gin_helper::internal::Event> event = gin::Handle<gin_helper::internal::Event> event =
gin_helper::internal::Event::New(isolate); gin_helper::internal::Event::New(isolate);
@ -2563,7 +2563,7 @@ std::vector<content::NavigationEntry*> WebContents::GetHistory() const {
// If the history is empty, it contains only one entry and that is // If the history is empty, it contains only one entry and that is
// "InitialEntry" // "InitialEntry"
if (history_length == 1 && controller.GetEntryAtIndex(0)->IsInitialEntry()) if (history_length == 1 && controller.GetEntryAtIndex(0)->IsInitialEntry())
return std::vector<content::NavigationEntry*>(); return {};
std::vector<content::NavigationEntry*> history; std::vector<content::NavigationEntry*> history;
history.reserve(history_length); history.reserve(history_length);

View file

@ -66,7 +66,7 @@ gin::Handle<WebContents> WebContentsView::GetWebContents(v8::Isolate* isolate) {
if (api_web_contents_) if (api_web_contents_)
return gin::CreateHandle(isolate, api_web_contents_.get()); return gin::CreateHandle(isolate, api_web_contents_.get());
else else
return gin::Handle<WebContents>(); return {};
} }
void WebContentsView::SetBackgroundColor(std::optional<WrappedSkColor> color) { void WebContentsView::SetBackgroundColor(std::optional<WrappedSkColor> color) {
@ -153,7 +153,7 @@ gin::Handle<WebContentsView> WebContentsView::Create(
if (gin::ConvertFromV8(isolate, web_contents_view_obj, &web_contents_view)) if (gin::ConvertFromV8(isolate, web_contents_view_obj, &web_contents_view))
return web_contents_view; return web_contents_view;
} }
return gin::Handle<WebContentsView>(); return {};
} }
// static // static

View file

@ -435,14 +435,14 @@ void WebFrameMain::DOMContentLoaded() {
// static // static
gin::Handle<WebFrameMain> WebFrameMain::New(v8::Isolate* isolate) { gin::Handle<WebFrameMain> WebFrameMain::New(v8::Isolate* isolate) {
return gin::Handle<WebFrameMain>(); return {};
} }
// static // static
gin::Handle<WebFrameMain> WebFrameMain::From(v8::Isolate* isolate, gin::Handle<WebFrameMain> WebFrameMain::From(v8::Isolate* isolate,
content::RenderFrameHost* rfh) { content::RenderFrameHost* rfh) {
if (!rfh) if (!rfh)
return gin::Handle<WebFrameMain>(); return {};
auto* web_frame = FromRenderFrameHost(rfh); auto* web_frame = FromRenderFrameHost(rfh);
if (web_frame) if (web_frame)

View file

@ -723,11 +723,11 @@ gin::Handle<WebRequest> WebRequest::From(
v8::Isolate* isolate, v8::Isolate* isolate,
content::BrowserContext* browser_context) { content::BrowserContext* browser_context) {
if (!browser_context) if (!browser_context)
return gin::Handle<WebRequest>(); return {};
auto* user_data = auto* user_data =
static_cast<UserData*>(browser_context->GetUserData(kUserDataKey)); static_cast<UserData*>(browser_context->GetUserData(kUserDataKey));
if (!user_data) if (!user_data)
return gin::Handle<WebRequest>(); return {};
return gin::CreateHandle(isolate, user_data->data.get()); return gin::CreateHandle(isolate, user_data->data.get());
} }

View file

@ -225,7 +225,7 @@ std::vector<blink::MessagePortChannel> MessagePort::DisentanglePorts(
const std::vector<gin::Handle<MessagePort>>& ports, const std::vector<gin::Handle<MessagePort>>& ports,
bool* threw_exception) { bool* threw_exception) {
if (ports.empty()) if (ports.empty())
return std::vector<blink::MessagePortChannel>(); return {};
std::unordered_set<MessagePort*> visited; std::unordered_set<MessagePort*> visited;
@ -244,7 +244,7 @@ std::vector<blink::MessagePortChannel> MessagePort::DisentanglePorts(
gin_helper::ErrorThrower(isolate).ThrowError( gin_helper::ErrorThrower(isolate).ThrowError(
"Port at index " + base::NumberToString(i) + " is " + type + "."); "Port at index " + base::NumberToString(i) + " is " + type + ".");
*threw_exception = true; *threw_exception = true;
return std::vector<blink::MessagePortChannel>(); return {};
} }
visited.insert(port); visited.insert(port);
} }

View file

@ -97,7 +97,7 @@ bool IsValidCustomProtocol(const std::wstring& scheme) {
std::wstring GetAppInfoHelperForProtocol(ASSOCSTR assoc_str, const GURL& url) { std::wstring GetAppInfoHelperForProtocol(ASSOCSTR assoc_str, const GURL& url) {
const std::wstring url_scheme = base::ASCIIToWide(url.scheme_piece()); const std::wstring url_scheme = base::ASCIIToWide(url.scheme_piece());
if (!IsValidCustomProtocol(url_scheme)) if (!IsValidCustomProtocol(url_scheme))
return std::wstring(); return {};
wchar_t out_buffer[1024]; wchar_t out_buffer[1024];
DWORD buffer_size = std::size(out_buffer); DWORD buffer_size = std::size(out_buffer);
@ -106,7 +106,7 @@ std::wstring GetAppInfoHelperForProtocol(ASSOCSTR assoc_str, const GURL& url) {
nullptr, out_buffer, &buffer_size); nullptr, out_buffer, &buffer_size);
if (FAILED(hr)) { if (FAILED(hr)) {
DLOG(WARNING) << "AssocQueryString failed!"; DLOG(WARNING) << "AssocQueryString failed!";
return std::wstring(); return {};
} }
return std::wstring(out_buffer); return std::wstring(out_buffer);
} }
@ -251,7 +251,7 @@ std::unique_ptr<FileVersionInfo> FetchFileVersionInfo() {
electron::ScopedAllowBlockingForElectron allow_blocking; electron::ScopedAllowBlockingForElectron allow_blocking;
return FileVersionInfo::CreateFileVersionInfo(path); return FileVersionInfo::CreateFileVersionInfo(path);
} }
return std::unique_ptr<FileVersionInfo>(); return {};
} }
} // namespace } // namespace

View file

@ -796,7 +796,7 @@ ElectronBrowserClient::CreateClientCertStore(
#elif BUILDFLAG(IS_MAC) #elif BUILDFLAG(IS_MAC)
return std::make_unique<net::ClientCertStoreMac>(); return std::make_unique<net::ClientCertStoreMac>();
#elif defined(USE_OPENSSL) #elif defined(USE_OPENSSL)
return std::unique_ptr<net::ClientCertStore>(); return ();
#endif #endif
} }
@ -805,7 +805,7 @@ ElectronBrowserClient::OverrideSystemLocationProvider() {
#if BUILDFLAG(OVERRIDE_LOCATION_PROVIDER) #if BUILDFLAG(OVERRIDE_LOCATION_PROVIDER)
return std::make_unique<FakeLocationProvider>(); return std::make_unique<FakeLocationProvider>();
#else #else
return nullptr; return {};
#endif #endif
} }

View file

@ -484,7 +484,7 @@ ElectronBrowserContext::CreateZoomLevelDelegate(
if (!IsOffTheRecord()) { if (!IsOffTheRecord()) {
return std::make_unique<ZoomLevelDelegate>(prefs(), partition_path); return std::make_unique<ZoomLevelDelegate>(prefs(), partition_path);
} }
return std::unique_ptr<content::ZoomLevelDelegate>(); return {};
} }
content::DownloadManagerDelegate* content::DownloadManagerDelegate*

View file

@ -54,7 +54,7 @@ ElectronWebUIControllerFactory::CreateWebUIControllerForURL(
if (host == chrome::kChromeUIAccessibilityHost) if (host == chrome::kChromeUIAccessibilityHost)
return std::make_unique<ElectronAccessibilityUI>(web_ui); return std::make_unique<ElectronAccessibilityUI>(web_ui);
return std::unique_ptr<content::WebUIController>(); return {};
} }
} // namespace electron } // namespace electron

View file

@ -97,7 +97,7 @@ std::unique_ptr<base::Value::Dict> ParseManifest(
if (!manifest.get() || !manifest->is_dict()) { if (!manifest.get() || !manifest->is_dict()) {
LOG(ERROR) << "Failed to parse extension manifest."; LOG(ERROR) << "Failed to parse extension manifest.";
return std::unique_ptr<base::Value::Dict>(); return {};
} }
return std::make_unique<base::Value::Dict>(std::move(*manifest).TakeDict()); return std::make_unique<base::Value::Dict>(std::move(*manifest).TakeDict());
} }

View file

@ -531,7 +531,7 @@ bool FileSelectHelper::IsAcceptTypeValid(const std::string& accept_type) {
base::FilePath FileSelectHelper::GetSanitizedFileName( base::FilePath FileSelectHelper::GetSanitizedFileName(
const base::FilePath& suggested_filename) { const base::FilePath& suggested_filename) {
if (suggested_filename.empty()) if (suggested_filename.empty())
return base::FilePath(); return {};
return net::GenerateFileName( return net::GenerateFileName(
GURL(), std::string(), std::string(), suggested_filename.AsUTF8Unsafe(), GURL(), std::string(), std::string(), suggested_filename.AsUTF8Unsafe(),
std::string(), l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME)); std::string(), l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));

View file

@ -297,12 +297,12 @@ void OffScreenRenderWidgetHostView::SetBounds(const gfx::Rect& new_bounds) {
} }
gfx::NativeView OffScreenRenderWidgetHostView::GetNativeView() { gfx::NativeView OffScreenRenderWidgetHostView::GetNativeView() {
return gfx::NativeView(); return {};
} }
gfx::NativeViewAccessible gfx::NativeViewAccessible
OffScreenRenderWidgetHostView::GetNativeViewAccessible() { OffScreenRenderWidgetHostView::GetNativeViewAccessible() {
return gfx::NativeViewAccessible(); return {};
} }
ui::TextInputClient* OffScreenRenderWidgetHostView::GetTextInputClient() { ui::TextInputClient* OffScreenRenderWidgetHostView::GetTextInputClient() {

View file

@ -74,19 +74,19 @@ gfx::Size OffScreenWebContentsView::GetSize() {
#if !BUILDFLAG(IS_MAC) #if !BUILDFLAG(IS_MAC)
gfx::NativeView OffScreenWebContentsView::GetNativeView() const { gfx::NativeView OffScreenWebContentsView::GetNativeView() const {
if (!native_window_) if (!native_window_)
return gfx::NativeView(); return {};
return native_window_->GetNativeView(); return native_window_->GetNativeView();
} }
gfx::NativeView OffScreenWebContentsView::GetContentNativeView() const { gfx::NativeView OffScreenWebContentsView::GetContentNativeView() const {
if (!native_window_) if (!native_window_)
return gfx::NativeView(); return {};
return native_window_->GetNativeView(); return native_window_->GetNativeView();
} }
gfx::NativeWindow OffScreenWebContentsView::GetTopLevelNativeWindow() const { gfx::NativeWindow OffScreenWebContentsView::GetTopLevelNativeWindow() const {
if (!native_window_) if (!native_window_)
return gfx::NativeWindow(); return {};
return native_window_->GetNativeWindow(); return native_window_->GetNativeWindow();
} }
#endif #endif

View file

@ -50,13 +50,13 @@ class TCPServerSocketFactory : public content::DevToolsSocketFactory {
auto socket = auto socket =
std::make_unique<net::TCPServerSocket>(nullptr, net::NetLogSource()); std::make_unique<net::TCPServerSocket>(nullptr, net::NetLogSource());
if (socket->ListenWithAddressAndPort(address_, port_, 10) != net::OK) if (socket->ListenWithAddressAndPort(address_, port_, 10) != net::OK)
return std::unique_ptr<net::ServerSocket>(); return {};
return socket; return socket;
} }
std::unique_ptr<net::ServerSocket> CreateForTethering( std::unique_ptr<net::ServerSocket> CreateForTethering(
std::string* name) override { std::string* name) override {
return std::unique_ptr<net::ServerSocket>(); return {};
} }
std::string address_; std::string address_;

View file

@ -532,14 +532,14 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
gin_helper::Dictionary opts; gin_helper::Dictionary opts;
if (!args->GetNext(&opts)) { if (!args->GetNext(&opts)) {
args->ThrowTypeError("Expected a dictionary"); args->ThrowTypeError("Expected a dictionary");
return gin::Handle<SimpleURLLoaderWrapper>(); return {};
} }
auto request = std::make_unique<network::ResourceRequest>(); auto request = std::make_unique<network::ResourceRequest>();
opts.Get("method", &request->method); opts.Get("method", &request->method);
opts.Get("url", &request->url); opts.Get("url", &request->url);
if (!request->url.is_valid()) { if (!request->url.is_valid()) {
args->ThrowTypeError("Invalid URL"); args->ThrowTypeError("Invalid URL");
return gin::Handle<SimpleURLLoaderWrapper>(); return {};
} }
request->site_for_cookies = net::SiteForCookies::FromUrl(request->url); request->site_for_cookies = net::SiteForCookies::FromUrl(request->url);
opts.Get("referrer", &request->referrer); opts.Get("referrer", &request->referrer);
@ -607,7 +607,7 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
if (!net::HttpUtil::IsValidHeaderName(it.first) || if (!net::HttpUtil::IsValidHeaderName(it.first) ||
!net::HttpUtil::IsValidHeaderValue(it.second)) { !net::HttpUtil::IsValidHeaderValue(it.second)) {
args->ThrowTypeError("Invalid header name or value"); args->ThrowTypeError("Invalid header name or value");
return gin::Handle<SimpleURLLoaderWrapper>(); return {};
} }
request->headers.SetHeader(it.first, it.second); request->headers.SetHeader(it.first, it.second);
} }

View file

@ -49,10 +49,10 @@ v8::Local<v8::Value> GetHiddenValue(v8::Isolate* isolate,
v8::Local<v8::Value> value; v8::Local<v8::Value> value;
v8::Maybe<bool> result = object->HasPrivate(context, privateKey); v8::Maybe<bool> result = object->HasPrivate(context, privateKey);
if (!(result.IsJust() && result.FromJust())) if (!(result.IsJust() && result.FromJust()))
return v8::Local<v8::Value>(); return {};
if (object->GetPrivate(context, privateKey).ToLocal(&value)) if (object->GetPrivate(context, privateKey).ToLocal(&value))
return value; return value;
return v8::Local<v8::Value>(); return {};
} }
void SetHiddenValue(v8::Isolate* isolate, void SetHiddenValue(v8::Isolate* isolate,

View file

@ -49,7 +49,7 @@ base::span<const APIPermissionInfo::InitInfo> GetPermissionInfos() {
return base::make_span(permissions_to_register); return base::make_span(permissions_to_register);
} }
base::span<const Alias> GetPermissionAliases() { base::span<const Alias> GetPermissionAliases() {
return base::span<const Alias>(); return {};
} }
} // namespace } // namespace

View file

@ -64,7 +64,7 @@ v8::Local<v8::Value> CallMethod(v8::Isolate* isolate,
return scope.Escape(CustomEmit(isolate, v8_object, method_name, return scope.Escape(CustomEmit(isolate, v8_object, method_name,
std::forward<Args>(args)...)); std::forward<Args>(args)...));
else else
return v8::Local<v8::Value>(); return {};
} }
template <typename T, typename... Args> template <typename T, typename... Args>

View file

@ -101,7 +101,7 @@ class TrackableObject : public TrackableObjectBase, public EventEmitter<T> {
if (weak_map_) if (weak_map_)
return weak_map_->Values(isolate); return weak_map_->Values(isolate);
else else
return std::vector<v8::Local<v8::Object>>(); return {};
} }
// Removes this instance from the weak map. // Removes this instance from the weak map.

View file

@ -25,7 +25,7 @@ std::optional<bool> IsUnsignedOrAdHocSigned(SecCodeRef code) {
} }
if (status != errSecSuccess) { if (status != errSecSuccess) {
OSSTATUS_LOG(ERROR, status) << "SecCodeCopyStaticCode"; OSSTATUS_LOG(ERROR, status) << "SecCodeCopyStaticCode";
return std::optional<bool>(); return {};
} }
// Copy the signing info from the SecStaticCodeRef. // Copy the signing info from the SecStaticCodeRef.
base::apple::ScopedCFTypeRef<CFDictionaryRef> signing_info; base::apple::ScopedCFTypeRef<CFDictionaryRef> signing_info;
@ -34,7 +34,7 @@ std::optional<bool> IsUnsignedOrAdHocSigned(SecCodeRef code) {
signing_info.InitializeInto()); signing_info.InitializeInto());
if (status != errSecSuccess) { if (status != errSecSuccess) {
OSSTATUS_LOG(ERROR, status) << "SecCodeCopySigningInformation"; OSSTATUS_LOG(ERROR, status) << "SecCodeCopySigningInformation";
return std::optional<bool>(); return {};
} }
// Look up the code signing flags. If the flags are absent treat this as // Look up the code signing flags. If the flags are absent treat this as
// unsigned. This decision is consistent with the StaticCode source: // unsigned. This decision is consistent with the StaticCode source:
@ -51,7 +51,7 @@ std::optional<bool> IsUnsignedOrAdHocSigned(SecCodeRef code) {
long long flags; long long flags;
if (!CFNumberGetValue(signing_info_flags, kCFNumberLongLongType, &flags)) { if (!CFNumberGetValue(signing_info_flags, kCFNumberLongLongType, &flags)) {
LOG(ERROR) << "CFNumberGetValue"; LOG(ERROR) << "CFNumberGetValue";
return std::optional<bool>(); return {};
} }
if (static_cast<uint32_t>(flags) & kSecCodeSignatureAdhoc) { if (static_cast<uint32_t>(flags) & kSecCodeSignatureAdhoc) {
return true; return true;

View file

@ -190,7 +190,7 @@ v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
v8::Local<v8::FixedArray> v8_import_assertions) { v8::Local<v8::FixedArray> v8_import_assertions) {
if (node::Environment::GetCurrent(context) == nullptr) { if (node::Environment::GetCurrent(context) == nullptr) {
if (electron::IsBrowserProcess() || electron::IsUtilityProcess()) if (electron::IsBrowserProcess() || electron::IsUtilityProcess())
return v8::MaybeLocal<v8::Promise>(); return {};
return blink::V8Initializer::HostImportModuleDynamically( return blink::V8Initializer::HostImportModuleDynamically(
context, v8_host_defined_options, v8_referrer_resource_url, context, v8_host_defined_options, v8_referrer_resource_url,
v8_specifier, v8_import_assertions); v8_specifier, v8_import_assertions);

View file

@ -152,7 +152,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
"Electron contextBridge recursion depth exceeded. " "Electron contextBridge recursion depth exceeded. "
"Nested objects " "Nested objects "
"deeper than 1000 are not supported."))); "deeper than 1000 are not supported.")));
return v8::MaybeLocal<v8::Value>(); return {};
} }
// Certain primitives always use the current contexts prototype and we can // Certain primitives always use the current contexts prototype and we can
@ -209,7 +209,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
if (!v8::Function::New(destination_context, ProxyFunctionWrapper, state) if (!v8::Function::New(destination_context, ProxyFunctionWrapper, state)
.ToLocal(&proxy_func)) .ToLocal(&proxy_func))
return v8::MaybeLocal<v8::Value>(); return {};
SetPrivate(destination_context, proxy_func.As<v8::Object>(), SetPrivate(destination_context, proxy_func.As<v8::Object>(),
context_bridge::kOriginalFunctionPrivateKey, func); context_bridge::kOriginalFunctionPrivateKey, func);
object_cache->CacheProxiedObject(value, proxy_func); object_cache->CacheProxiedObject(value, proxy_func);
@ -372,11 +372,11 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
arr->Get(source_context, i).ToLocalChecked(), value, object_cache, arr->Get(source_context, i).ToLocalChecked(), value, object_cache,
support_dynamic_properties, recursion_depth + 1, error_target); support_dynamic_properties, recursion_depth + 1, error_target);
if (value_for_array.IsEmpty()) if (value_for_array.IsEmpty())
return v8::MaybeLocal<v8::Value>(); return {};
if (!IsTrue(cloned_arr->Set(destination_context, static_cast<int>(i), if (!IsTrue(cloned_arr->Set(destination_context, static_cast<int>(i),
value_for_array.ToLocalChecked()))) { value_for_array.ToLocalChecked()))) {
return v8::MaybeLocal<v8::Value>(); return {};
} }
} }
object_cache->CacheProxiedObject(value, cloned_arr); object_cache->CacheProxiedObject(value, cloned_arr);
@ -408,7 +408,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
object_value, source_context, destination_context, object_cache, object_value, source_context, destination_context, object_cache,
support_dynamic_properties, recursion_depth + 1, error_target); support_dynamic_properties, recursion_depth + 1, error_target);
if (passed_value.IsEmpty()) if (passed_value.IsEmpty())
return v8::MaybeLocal<v8::Value>(); return {};
return v8::MaybeLocal<v8::Value>(passed_value.ToLocalChecked()); return v8::MaybeLocal<v8::Value>(passed_value.ToLocalChecked());
} }
@ -421,7 +421,7 @@ v8::MaybeLocal<v8::Value> PassValueToOtherContext(
v8::Context::Scope error_scope(error_context); v8::Context::Scope error_scope(error_context);
// V8 serializer will throw an error if required // V8 serializer will throw an error if required
if (!gin::ConvertFromV8(error_context->GetIsolate(), value, &ret)) { if (!gin::ConvertFromV8(error_context->GetIsolate(), value, &ret)) {
return v8::MaybeLocal<v8::Value>(); return {};
} }
} }
@ -651,7 +651,7 @@ v8::MaybeLocal<v8::Object> CreateProxyForAPI(
object_cache, support_dynamic_properties, recursion_depth + 1, object_cache, support_dynamic_properties, recursion_depth + 1,
error_target); error_target);
if (passed_value.IsEmpty()) if (passed_value.IsEmpty())
return v8::MaybeLocal<v8::Object>(); return {};
proxy.Set(key, passed_value.ToLocalChecked()); proxy.Set(key, passed_value.ToLocalChecked());
} }

View file

@ -107,11 +107,11 @@ class IPCRenderer final : public gin::Wrappable<IPCRenderer>,
v8::Local<v8::Value> arguments) { v8::Local<v8::Value> arguments) {
if (!electron_ipc_remote_) { if (!electron_ipc_remote_) {
thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError); thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
return v8::Local<v8::Promise>(); return {};
} }
blink::CloneableMessage message; blink::CloneableMessage message;
if (!electron::SerializeV8Value(isolate, arguments, &message)) { if (!electron::SerializeV8Value(isolate, arguments, &message)) {
return v8::Local<v8::Promise>(); return {};
} }
gin_helper::Promise<blink::CloneableMessage> p(isolate); gin_helper::Promise<blink::CloneableMessage> p(isolate);
auto handle = p.GetHandle(); auto handle = p.GetHandle();
@ -189,11 +189,11 @@ class IPCRenderer final : public gin::Wrappable<IPCRenderer>,
v8::Local<v8::Value> arguments) { v8::Local<v8::Value> arguments) {
if (!electron_ipc_remote_) { if (!electron_ipc_remote_) {
thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError); thrower.ThrowError(kIPCMethodCalledAfterContextReleasedError);
return v8::Local<v8::Value>(); return {};
} }
blink::CloneableMessage message; blink::CloneableMessage message;
if (!electron::SerializeV8Value(isolate, arguments, &message)) { if (!electron::SerializeV8Value(isolate, arguments, &message)) {
return v8::Local<v8::Value>(); return {};
} }
blink::CloneableMessage result; blink::CloneableMessage result;

View file

@ -45,7 +45,7 @@ v8::Local<v8::Object> GetIpcObject(v8::Local<v8::Context> context) {
global_object->GetPrivate(context, private_binding_key).ToLocalChecked(); global_object->GetPrivate(context, private_binding_key).ToLocalChecked();
if (value.IsEmpty() || !value->IsObject()) { if (value.IsEmpty() || !value->IsObject()) {
LOG(ERROR) << "Attempted to get the 'ipcNative' object but it was missing"; LOG(ERROR) << "Attempted to get the 'ipcNative' object but it was missing";
return v8::Local<v8::Object>(); return {};
} }
return value->ToObject(context).ToLocalChecked(); return value->ToObject(context).ToLocalChecked();
} }

View file

@ -86,7 +86,7 @@ v8::Local<v8::Value> CreatePreloadScript(v8::Isolate* isolate,
auto maybe_script = v8::Script::Compile(context, source); auto maybe_script = v8::Script::Compile(context, source);
v8::Local<v8::Script> script; v8::Local<v8::Script> script;
if (!maybe_script.ToLocal(&script)) if (!maybe_script.ToLocal(&script))
return v8::Local<v8::Value>(); return {};
return script->Run(context).ToLocalChecked(); return script->Run(context).ToLocalChecked();
} }

View file

@ -456,7 +456,7 @@ v8::Local<v8::Object> RendererClientBase::GetScriptableObject(
if (container_manager) if (container_manager)
return container_manager->GetScriptableObject(plugin_element, isolate); return container_manager->GetScriptableObject(plugin_element, isolate);
#endif #endif
return v8::Local<v8::Object>(); return {};
} }
std::unique_ptr<blink::WebPrescientNetworking> std::unique_ptr<blink::WebPrescientNetworking>