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

perf: avoid redundant map lookup in NativeImage::GetHICON() (#39058)

Browse source 
perf: avoid double map lookup in NativeImage::GetHICON()
This commit is contained in:
Charles Kerr 2023-07-13 01:37:43 -05:00 • committed by GitHub
parent da3475998f
commit a8622aed7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -202,21 +202,23 @@ bool NativeImage::TryConvertNativeImage(v8::Isolate* isolate,
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
HICON NativeImage::GetHICON(int size) { HICON NativeImage::GetHICON(int size) {
auto iter = hicons_.find(size); if (auto iter = hicons_.find(size); iter != hicons_.end())
if (iter != hicons_.end())
return iter->second.get(); return iter->second.get();
// First try loading the icon with specified size. // First try loading the icon with specified size.
if (!hicon_path_.empty()) { if (!hicon_path_.empty()) {
hicons_[size] = ReadICOFromPath(size, hicon_path_); auto& hicon = hicons_[size];
return hicons_[size].get(); hicon = ReadICOFromPath(size, hicon_path_);
return hicon.get();
} }
// Then convert the image to ICO. // Then convert the image to ICO.
if (image_.IsEmpty()) if (image_.IsEmpty())
return NULL; return NULL;
hicons_[size] = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
return hicons_[size].get(); auto& hicon = hicons_[size];
hicon = IconUtil::CreateHICONFromSkBitmap(image_.AsBitmap());
return hicon.get();
} }
#endif #endif