Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7252)

Unified Diff: chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

Issue 931993002: Make image_decoder a Leaky LazyInstance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename instance_ to image_decoder_instance_ for mac linker Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
index 460a563b7a2767745814dd00bfccd857ee954f25..49aeda276d9811a0e7241763a08dfe28827d3fa3 100644
--- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
+++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
@@ -61,13 +61,12 @@ class ImageDecoderDelegateAdapter : public ImageDecoder::Delegate {
}
// ImageDecoder::Delegate methods.
- void OnImageDecoded(const ImageDecoder* /*decoder*/,
- const SkBitmap& /*decoded_image*/) override {
+ void OnImageDecoded(const SkBitmap& /*decoded_image*/) override {
callback_.Run(base::File::FILE_OK);
delete this;
}
- void OnDecodeImageFailed(const ImageDecoder* /*decoder*/) override {
+ void OnDecodeImageFailed() override {
callback_.Run(base::File::FILE_ERROR_SECURITY);
delete this;
}
@@ -127,8 +126,8 @@ void SupportedImageTypeValidator::OnFileOpen(scoped_ptr<std::string> data) {
// |adapter| will delete itself after a completion message is received.
ImageDecoderDelegateAdapter* adapter =
new ImageDecoderDelegateAdapter(data.Pass(), callback_);
- decoder_ = new ImageDecoder(adapter, adapter->data(),
- ImageDecoder::DEFAULT_CODEC);
- decoder_->Start(content::BrowserThread::GetMessageLoopProxyForThread(
- BrowserThread::IO));
+ ImageDecoder::GetInstance()->Start(
+ adapter, adapter->data(), ImageDecoder::DEFAULT_CODEC,
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ BrowserThread::IO));
}

Powered by Google App Engine
This is Rietveld 408576698