Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes...

printing/image.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "printing/image.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
-#include "base/gfx/png_decoder.h"
-#include "base/gfx/png_encoder.h"
 #include "base/gfx/rect.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_WIN)
 #include "base/gfx/gdi_util.h"  // EMF support
 #endif
 
 namespace {
@@ skipping 74 matching lines @@
 
 std::string Image::checksum() const {
   MD5Digest digest;
   MD5Sum(&data_[0], data_.size(), &digest);
   return HexEncode(&digest, sizeof(digest));
 }
 
 bool Image::SaveToPng(const std::wstring& filename) const {
   DCHECK(!data_.empty());
   std::vector<unsigned char> compressed;
-  bool success = PNGEncoder::Encode(&*data_.begin(),
-                                    PNGEncoder::FORMAT_BGRA,
-                                    size_.width(),
-                                    size_.height(),
-                                    row_length_,
-                                    true,
-                                    &compressed);
+  bool success = gfx::PNGCodec::Encode(&*data_.begin(),
+                                       gfx::PNGCodec::FORMAT_BGRA,
+                                       size_.width(),
+                                       size_.height(),
+                                       row_length_,
+                                       true,
+                                       &compressed);
   DCHECK(success && compressed.size());
   if (success) {
     int write_bytes = file_util::WriteFile(
         filename,
         reinterpret_cast<char*>(&*compressed.begin()), compressed.size());
     success = (write_bytes == static_cast<int>(compressed.size()));
     DCHECK(success);
   }
   return success;
 }
@@ skipping 51 matching lines @@
   // Like the WebKit ImageDiff tool, we define percentage different in terms
   // of the size of the 'actual' bitmap.
   double total_pixels = static_cast<double>(size_.width()) *
       static_cast<double>(height);
   return static_cast<double>(pixels_different) / total_pixels * 100.;
 }
 
 bool Image::LoadPng(const std::string& compressed) {
   int w;
   int h;
-  bool success = PNGDecoder::Decode(
+  bool success = gfx::PNGCodec::Decode(
       reinterpret_cast<const unsigned char*>(compressed.c_str()),
-      compressed.size(), PNGDecoder::FORMAT_BGRA, &data_, &w, &h);
+      compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h);
   size_.SetSize(w, h);
   row_length_ = size_.width() * sizeof(uint32);
   return success;
 }
 
 bool Image::LoadMetafile(const std::string& data) {
   DCHECK(!data.empty());
 #if defined(OS_WIN)
   NativeMetafile metafile;
   metafile.CreateFromData(data.data(), data.size());
@@ skipping 36 matching lines @@
     return success;
   }
 #else
   NOTIMPLEMENTED();
 #endif
 
   return false;
 }
 
 }  // namespace printing