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

don't store isolate_ in NativeImage and tune size hints

Browse source
This commit is contained in:
Heilig Benedek 2017-05-02 04:29:16 +02:00
parent 576b702e8b
commit 5c690ea46e
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
atom/common/api/atom_api_native_image.cc
View file

@ -200,30 +200,34 @@ void Noop(char*, void*) {
} // namespace } // namespace
NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image) NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
: image_(image), isolate_(isolate) { : image_(image) {
Init(isolate_); Init(isolate);
isolate_->AdjustAmountOfExternalAllocatedMemory( if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
image_.Width() * image_.Height() * 4); isolate->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->getSize());
}
MarkHighMemoryUsage(); MarkHighMemoryUsage();
} }
#if defined(OS_WIN) #if defined(OS_WIN)
NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path) NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
: hicon_path_(hicon_path), isolate_(isolate) { : hicon_path_(hicon_path) {
// Use the 256x256 icon as fallback icon. // Use the 256x256 icon as fallback icon.
gfx::ImageSkia image_skia; gfx::ImageSkia image_skia;
ReadImageSkiaFromICO(&image_skia, GetHICON(256)); ReadImageSkiaFromICO(&image_skia, GetHICON(256));
image_ = gfx::Image(image_skia); image_ = gfx::Image(image_skia);
Init(isolate); Init(isolate);
isolate_->AdjustAmountOfExternalAllocatedMemory( isolate->AdjustAmountOfExternalAllocatedMemory(
image_.Width() * image_.Height() * 4); image_.ToImageSkia()->bitmap()->getSize());
MarkHighMemoryUsage(); MarkHighMemoryUsage();
} }
#endif #endif
NativeImage::~NativeImage() { NativeImage::~NativeImage() {
isolate_->AdjustAmountOfExternalAllocatedMemory( if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
- image_.Width() * image_.Height() * 4); isolate()->AdjustAmountOfExternalAllocatedMemory(
- static_cast<int64_t>(image_.ToImageSkia()->bitmap()->getSize()));
}
} }
#if defined(OS_WIN) #if defined(OS_WIN)
@ -362,9 +366,6 @@ mate::Handle<NativeImage> NativeImage::Resize(
bool height_set = options.GetInteger("height", &height); bool height_set = options.GetInteger("height", &height);
size.SetSize(width, height); size.SetSize(width, height);
isolate_->AdjustAmountOfExternalAllocatedMemory(
(width_set * height_set - width * height) * 4);
if (width_set && !height_set) { if (width_set && !height_set) {
// Scale height to preserve original aspect ratio // Scale height to preserve original aspect ratio
size.set_height(width); size.set_height(width);

1
atom/common/api/atom_api_native_image.h
View file

@ -99,7 +99,6 @@ class NativeImage : public mate::Wrappable<NativeImage> {
#endif #endif
gfx::Image image_; gfx::Image image_;
v8::Isolate* isolate_;
DISALLOW_COPY_AND_ASSIGN(NativeImage); DISALLOW_COPY_AND_ASSIGN(NativeImage);
}; };