Added ROBUST_PNG_CODEC to ImageDecoder

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 <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff.h"
 #include "ipc/ipc_channel.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h"
+#include "ui/gfx/codec/png_codec.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "chrome/common/resource_usage_reporter.mojom.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #endif
 
@@ skipping 114 matching lines @@
     const IPC::Message& message) {
   if (filter_messages_ && !ContainsKey(message_id_whitelist_, message.type()))
     return false;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeContentUtilityClient, message)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_DecodeImage, OnDecodeImage)
 #if defined(OS_CHROMEOS)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RobustJPEGDecodeImage,
                         OnRobustJPEGDecodeImage)
+    IPC_MESSAGE_HANDLER(ChromeUtilityMsg_RobustPNGDecodeImage,
+                        OnRobustPNGDecodeImage)
 #endif  // defined(OS_CHROMEOS)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_PatchFileBsdiff,
                         OnPatchFileBsdiff)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_PatchFileCourgette,
                         OnPatchFileCourgette)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_StartupPing, OnStartupPing)
 #if defined(FULL_SAFE_BROWSING)
     IPC_MESSAGE_HANDLER(ChromeUtilityMsg_AnalyzeZipFileForDownloadProtection,
                         OnAnalyzeZipFileForDownloadProtection)
 #if defined(OS_MACOSX)
@@ skipping 141 matching lines @@
       Send(new ChromeUtilityHostMsg_DecodeImage_Failed(request_id));
     } else {
       Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image,
                                                           request_id));
     }
   } else {
     Send(new ChromeUtilityHostMsg_DecodeImage_Failed(request_id));
   }
   ReleaseProcessIfNeeded();
 }
+
+void ChromeContentUtilityClient::OnRobustPNGDecodeImage(
+    const std::vector<unsigned char>& encoded_data,
+    int request_id) {
+  // Our robust PNG decoding is using libpng.
+  if (!encoded_data.empty()) {
+    SkBitmap decoded_image;
+    if (gfx::PNGCodec::Decode(encoded_data.data(),
+                              encoded_data.size(),
+                              &decoded_image)) {
+      Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(decoded_image,
+                                                          request_id));
+    } else {
+      Send(new ChromeUtilityHostMsg_DecodeImage_Failed(request_id));
+    }
+  } else {
+    Send(new ChromeUtilityHostMsg_DecodeImage_Failed(request_id));
+  }
+  ReleaseProcessIfNeeded();
+}
 #endif  // defined(OS_CHROMEOS)
 
 void ChromeContentUtilityClient::OnPatchFileBsdiff(
     const base::FilePath& input_file,
     const base::FilePath& patch_file,
     const base::FilePath& output_file) {
   if (input_file.empty() || patch_file.empty() || output_file.empty()) {
     Send(new ChromeUtilityHostMsg_PatchFile_Finished(-1));
   } else {
     const int patch_status = courgette::ApplyBinaryPatch(input_file,
@@ skipping 44 matching lines @@
   safe_browsing::zip_analyzer::Results results;
   safe_browsing::dmg::AnalyzeDMGFile(
       IPC::PlatformFileForTransitToFile(dmg_file), &results);
   Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
       results));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_MACOSX)
 
 #endif  // defined(FULL_SAFE_BROWSING)