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

Unified Diff: chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 843b1f37ea88030b14df9df1bb7689375d07486c..b714f4cfa9f70a4972968d1344e5722ad5f6f248 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -208,20 +208,20 @@ SkBitmap ChromeContentUtilityClient::DecodeImage(
// static
void ChromeContentUtilityClient::DecodeImageAndSend(
- const std::vector<unsigned char>& encoded_data, bool shrink_to_fit){
+ const std::vector<unsigned char>& encoded_data, bool shrink_to_fit, int id){
SkBitmap decoded_image = DecodeImage(encoded_data, shrink_to_fit);
if (decoded_image.empty()) {
- Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
+ Send(new ChromeUtilityHostMsg_DecodeImage_Failed(id));
} else {
- Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(decoded_image));
+ Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(decoded_image, id));
}
ReleaseProcessIfNeeded();
}
void ChromeContentUtilityClient::OnDecodeImage(
- const std::vector<unsigned char>& encoded_data, bool shrink_to_fit) {
- DecodeImageAndSend(encoded_data, shrink_to_fit);
+ const std::vector<unsigned char>& encoded_data, bool shrink_to_fit, int id){
+ DecodeImageAndSend(encoded_data, shrink_to_fit, id);
}
#if defined(OS_CHROMEOS)
@@ -257,19 +257,19 @@ void ChromeContentUtilityClient::OnCreateZipFile(
#endif // defined(OS_CHROMEOS)
void ChromeContentUtilityClient::OnRobustJPEGDecodeImage(
- const std::vector<unsigned char>& encoded_data) {
+ const std::vector<unsigned char>& encoded_data, int id) {
// Our robust jpeg decoding is using IJG libjpeg.
if (gfx::JPEGCodec::JpegLibraryVariant() == gfx::JPEGCodec::IJG_LIBJPEG &&
!encoded_data.empty()) {
scoped_ptr<SkBitmap> decoded_image(gfx::JPEGCodec::Decode(
&encoded_data[0], encoded_data.size()));
if (!decoded_image.get() || decoded_image->empty()) {
- Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
+ Send(new ChromeUtilityHostMsg_DecodeImage_Failed(id));
} else {
- Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image));
+ Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image, id));
}
} else {
- Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
+ Send(new ChromeUtilityHostMsg_DecodeImage_Failed(id));
}
ReleaseProcessIfNeeded();
}

Powered by Google App Engine
This is Rietveld 408576698