Move image_decoder.cc/.h from webkit\glue to content\child.

chrome/common/extensions/unpacker.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/common/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/child/image_decoder_utils.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/glue/image_decoder.h"
+#include "ui/gfx/size.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 namespace filenames = extension_filenames;
 
 namespace {
 
 // A limit to stop us passing dangerously large canvases to the browser.
 const int kMaxImageCanvas = 4096 * 4096;
 
 SkBitmap DecodeImage(const base::FilePath& path) {
   // Read the file from disk.
   std::string file_contents;
   if (!file_util::PathExists(path) ||
       !file_util::ReadFileToString(path, &file_contents)) {
     return SkBitmap();
   }
 
   // Decode the image using WebKit's image decoder.
   const unsigned char* data =
       reinterpret_cast<const unsigned char*>(file_contents.data());
-  webkit_glue::ImageDecoder decoder;
-  SkBitmap bitmap = decoder.Decode(data, file_contents.length());
+  SkBitmap bitmap = content::DecodeImage(data,
+                                         gfx::Size(),
+                                         file_contents.length());
   Sk64 bitmap_size = bitmap.getSize64();
   if (!bitmap_size.is32() || bitmap_size.get32() > kMaxImageCanvas)
     return SkBitmap();
   return bitmap;
 }
 
 bool PathContainsParentDirectory(const base::FilePath& path) {
   const base::FilePath::StringType kSeparators(base::FilePath::kSeparators);
   const base::FilePath::StringType kParentDirectory(
       base::FilePath::kParentDirectory);
@@ skipping 269 matching lines @@
 
 void Unpacker::SetError(const std::string &error) {
   SetUTF16Error(UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const string16 &error) {
   error_message_ = error;
 }
 
 }  // namespace extensions