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

refactor: fix modernize-return-braced-init-list warnings (#44857)

Browse source 
* refactor: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list]

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list]

NB: using the braced-initializer list uncovered an error here:
the float returned by std::floor() can't be implicitly cast to
an int. This is solved by using base::ClampFloor<int>() instead.
std::floor()

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-11-26 22:18:00 -06:00 • committed by GitHub
parent 7152209fb5
commit cd6e3d720f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 79 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/common/api/electron_api_clipboard.cc
View file

@ -231,7 +231,7 @@ gfx::Image Clipboard::ReadImage(gin_helper::Arguments* args) {
args->ThrowError(
"clipboard.readImage is available only after app ready in the main "
"process");
return gfx::Image();
return {};
}
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
@ -272,7 +272,7 @@ void Clipboard::WriteImage(const gfx::Image& image,
#if !BUILDFLAG(IS_MAC)
void Clipboard::WriteFindText(const std::u16string& text) {}
std::u16string Clipboard::ReadFindText() {
return std::u16string();
return {};
}
#endif

12
shell/common/api/electron_api_native_image.cc
View file

@ -321,7 +321,7 @@ gfx::Size NativeImage::GetSize(const std::optional<float> scale_factor) {
float sf = scale_factor.value_or(1.0f);
gfx::ImageSkiaRep image_rep = image_.AsImageSkia().GetRepresentation(sf);
return gfx::Size(image_rep.GetWidth(), image_rep.GetHeight());
return {image_rep.GetWidth(), image_rep.GetHeight()};
}
std::vector<float> NativeImage::GetScaleFactors() {
@ -487,7 +487,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromBitmap(
const gin_helper::Dictionary& options) {
if (!node::Buffer::HasInstance(buffer)) {
thrower.ThrowError("buffer must be a node Buffer");
return gin::Handle<NativeImage>();
return {};
}
int width = 0;
@ -495,12 +495,12 @@ gin::Handle<NativeImage> NativeImage::CreateFromBitmap(
if (!options.Get("width", &width)) {
thrower.ThrowError("width is required");
return gin::Handle<NativeImage>();
return {};
}
if (!options.Get("height", &height)) {
thrower.ThrowError("height is required");
return gin::Handle<NativeImage>();
return {};
}
if (width <= 0 || height <= 0)
@ -512,7 +512,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromBitmap(
const auto buffer_data = electron::util::as_byte_span(buffer);
if (size_bytes != buffer_data.size()) {
thrower.ThrowError("invalid buffer size");
return gin::Handle<NativeImage>();
return {};
}
SkBitmap bitmap;
@ -534,7 +534,7 @@ gin::Handle<NativeImage> NativeImage::CreateFromBuffer(
gin::Arguments* args) {
if (!node::Buffer::HasInstance(buffer)) {
thrower.ThrowError("buffer must be a node Buffer");
return gin::Handle<NativeImage>();
return {};
}
int width = 0;