Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: ensure external memory adjustments are balanced #33306

Merged
merged 1 commit into from Mar 17, 2022
Merged

fix: ensure external memory adjustments are balanced #33306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions shell/common/api/electron_api_native_image.cc
View file
Open in desktop
Expand Up @@ -109,7 +109,7 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {

NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
: image_(image), isolate_(isolate) {
AdjustAmountOfExternalAllocatedMemory(true);
UpdateExternalAllocatedMemoryUsage();
}

#if defined(OS_WIN)
Expand All @@ -120,22 +120,27 @@ NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
electron::util::ReadImageSkiaFromICO(&image_skia, GetHICON(256));
image_ = gfx::Image(image_skia);

AdjustAmountOfExternalAllocatedMemory(true);
UpdateExternalAllocatedMemoryUsage();
}
#endif

NativeImage::~NativeImage() {
AdjustAmountOfExternalAllocatedMemory(false);
isolate_->AdjustAmountOfExternalAllocatedMemory(-memory_usage_);
}

void NativeImage::AdjustAmountOfExternalAllocatedMemory(bool add) {
void NativeImage::UpdateExternalAllocatedMemoryUsage() {
int32_t new_memory_usage = 0;

if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
auto* const image_skia = image_.ToImageSkia();
if (!image_skia->isNull()) {
int64_t size = image_skia->bitmap()->computeByteSize();
isolate_->AdjustAmountOfExternalAllocatedMemory(add ? size : -size);
new_memory_usage = image_skia->bitmap()->computeByteSize();
}
}

isolate_->AdjustAmountOfExternalAllocatedMemory(new_memory_usage -
memory_usage_);
memory_usage_ = new_memory_usage;
}

// static
Expand Down
3 changes: 2 additions & 1 deletion shell/common/api/electron_api_native_image.h
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
float GetAspectRatio(const absl::optional<float> scale_factor);
void AddRepresentation(const gin_helper::Dictionary& options);

void AdjustAmountOfExternalAllocatedMemory(bool add);
void UpdateExternalAllocatedMemoryUsage();

// Mark the image as template image.
void SetTemplateImage(bool setAsTemplate);
Expand All @@ -136,6 +136,7 @@ class NativeImage : public gin::Wrappable<NativeImage> {
gfx::Image image_;

v8::Isolate* isolate_;
int32_t memory_usage_ = 0;
};

} // namespace api
Expand Down