DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1837 from jason-simmons/canvas_image_memory_leak

Browse Source 
Fix a memory leak in CanvasImageDecoder
This commit is contained in:
Jason Simmons 2015-10-27 15:11:43 -07:00
commit dabcd4c19c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sky/engine/core/painting/CanvasImageDecoder.cpp
View File

@ -49,18 +49,25 @@ void CanvasImageDecoder::initWithList(const Uint8List& list) {
void CanvasImageDecoder::Decode(PassRefPtr<SharedBuffer> buffer) {
TRACE_EVENT0("blink", "CanvasImageDecoder::Decode");
// Destroy the callback after this function completes. The Dart closure
// associated with the callback may hold a reference to the ImageDecoder,
// resulting in a circular reference.
CHECK(callback_);
OwnPtr<ImageDecoderCallback> callback(callback_.release());
OwnPtr<ImageDecoder> decoder =
ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied,
ImageSource::GammaAndColorProfileIgnored);
// decoder can be null if the buffer we was empty and we couldn't even guess
// what type of image to decode.
if (!decoder) {
callback_->handleEvent(nullptr);
callback->handleEvent(nullptr);
return;
}
decoder->setData(buffer.get(), true);
if (decoder->failed() || decoder->frameCount() == 0) {
callback_->handleEvent(nullptr);
callback->handleEvent(nullptr);
return;
}
@ -68,11 +75,13 @@ void CanvasImageDecoder::Decode(PassRefPtr<SharedBuffer> buffer) {
ImageFrame* imageFrame = decoder->frameBufferAtIndex(0);
RefPtr<SkImage> skImage = adoptRef(SkImage::NewFromBitmap(imageFrame->getSkBitmap()));
resultImage->setImage(skImage.release());
callback_->handleEvent(resultImage.get());
callback->handleEvent(resultImage.get());
}
void CanvasImageDecoder::RejectCallback() {
callback_->handleEvent(nullptr);
CHECK(callback_);
OwnPtr<ImageDecoderCallback> callback(callback_.release());
callback->handleEvent(nullptr);
}
} // namespace blink