Force avatar and wallpaper decoding to use robust JPEG.

chrome/utility/chrome_content_utility_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "content/public/utility/utility_thread.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "content/public/common/content_switches.h"
 #include "printing/emf_win.h"
@@ skipping 33 matching lines @@
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeContentUtilityClient, message)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackExtension, OnUnpackExtension)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_UnpackWebResource,
                         OnUnpackWebResource)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseUpdateManifest,
                         OnParseUpdateManifest)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImage, OnDecodeImage)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageBase64, OnDecodeImageBase64)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImageWithIJGlibjpeg,
+                        OnDecodeImageWithIJGlibjpeg)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RenderPDFPagesToMetafile,
                         OnRenderPDFPagesToMetafile)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseJSON, OnParseJSON)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_GetPrinterCapsAndDefaults,
                         OnGetPrinterCapsAndDefaults)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
 #if !defined(OS_ANDROID)
   if (!handled)
@@ skipping 83 matching lines @@
   }
 
   std::vector<unsigned char> decoded_vector(decoded_string.size());
   for (size_t i = 0; i < decoded_string.size(); ++i) {
     decoded_vector[i] = static_cast<unsigned char>(decoded_string[i]);
   }
 
   OnDecodeImage(decoded_vector);
 }
 
+void ChromeContentUtilityClient::OnDecodeImageWithIJGlibjpeg(
+    const std::vector<unsigned char>& encoded_data) {
+  webkit_glue::ImageDecoder decoder;
+  scoped_ptr<SkBitmap> decoded_image(gfx::JPEGCodec::Decode(&encoded_data[0],

[oshima, 2012/08/29 01:32:29]

align encoded_data.size() to &encoded_data[0].

If it doesn't fit to 80 chars, move &encoded_data[0] to
next line, like
    &encoded_data[0], encoded_data.size()

[Emmanuel Saint-loubert-Bié, 2012/08/29 01:57:18]

Done.

+      encoded_data.size()));
+  if (decoded_image->empty()) {
+    Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
+  } else {
+    Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image));
+  }
+  content::UtilityThread::Get()->ReleaseProcessIfNeeded();
+}
+
 void ChromeContentUtilityClient::OnRenderPDFPagesToMetafile(
     base::PlatformFile pdf_file,
     const FilePath& metafile_path,
     const printing::PdfRenderSettings& pdf_render_settings,
     const std::vector<printing::PageRange>& page_ranges) {
   bool succeeded = false;
 #if defined(OS_WIN)
   int highest_rendered_page_number = 0;
   double scale_factor = 1.0;
   succeeded = RenderPDFToWinMetafile(pdf_file,
@@ skipping 192 matching lines @@
   } else
 #endif
   {
     Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
         printer_name));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome