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

webkit/tools/test_shell/test_shell.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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
 #include "base/md5.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
@@ skipping 233 matching lines @@
 // static
 std::string TestShell::DumpImage(skia::PlatformCanvas* canvas,
     const std::wstring& file_name, const std::string& pixel_hash) {
   skia::BitmapPlatformDevice& device =
       static_cast<skia::BitmapPlatformDevice&>(canvas->getTopPlatformDevice());
   const SkBitmap& src_bmp = device.accessBitmap(false);
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
-  PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
+  gfx::PNGCodec::ColorFormat color_format = gfx::PNGCodec::FORMAT_BGRA;
 
   // Fix the alpha. The expected PNGs on Mac have an alpha channel, so we want
   // to keep it. On Windows, the alpha channel is wrong since text/form control
   // drawing may have erased it in a few places. So on Windows we force it to
   // opaque and also don't write the alpha channel for the reference. Linux
   // doesn't have the wrong alpha like Windows, but we ignore it anyway.
 #if defined(OS_WIN)
   bool discard_transparency = true;
   device.makeOpaque(0, 0, src_bmp.width(), src_bmp.height());
 #elif defined(OS_LINUX)
@@ skipping 11 matching lines @@
   MD5Init(&ctx);
   MD5Update(&ctx, src_bmp.getPixels(), src_bmp.getSize());
 
   MD5Digest digest;
   MD5Final(&digest, &ctx);
   std::string md5hash = MD5DigestToBase16(digest);
 
   // Only encode and dump the png if the hashes don't match. Encoding the image
   // is really expensive.
   if (md5hash.compare(pixel_hash) != 0) {
-    PNGEncoder::Encode(
+    gfx::PNGCodec::Encode(
         reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
         color_format, src_bmp.width(), src_bmp.height(),
         static_cast<int>(src_bmp.rowBytes()), discard_transparency, &png);
 
     // Write to disk.
     file_util::WriteFile(file_name, reinterpret_cast<const char *>(&png[0]),
                          png.size());
   }
 
   return md5hash;
@@ skipping 374 matching lines @@
 
 void CloseIdleConnections() {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 void SetCacheMode(bool enabled) {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 }  // namespace webkit_glue