diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 03:12:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-03 03:12:20 +0000 |
| commit | 468fec96cd171682405d30b266f71f1766396a07 (patch) | |
| tree | e3dc28717fa79c7149303d1c9ec6bb8437edfbcc /skia | |
| parent | db1faced81ea15604ca67135c5597d35269ff84a (diff) | |
| download | chromium_src-468fec96cd171682405d30b266f71f1766396a07.zip chromium_src-468fec96cd171682405d30b266f71f1766396a07.tar.gz chromium_src-468fec96cd171682405d30b266f71f1766396a07.tar.bz2 | |
Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes
into the gfx namespace.
Combine the PNGEncoder and PNGDecoder. There were separate when we had
different executables for the browser and renderer, and linked the encoder only
in one of them (which saved us some space used by libpng). This hasn't been the
case for years, so combining them (again) makes sense.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/243076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/vector_canvas_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc index 64a6b2b..4cebf7b 100644 --- a/skia/ext/vector_canvas_unittest.cc +++ b/skia/ext/vector_canvas_unittest.cc @@ -12,10 +12,10 @@ #include "PNGImageDecoder.h" +#include "app/gfx/codec/png_codec.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/gfx/gdi_util.h" -#include "base/gfx/png_encoder.h" #include "base/path_service.h" #include "base/string_util.h" #include "skia/ext/vector_canvas.h" @@ -116,13 +116,13 @@ class Image { // Save the image to a png file. Used to create the initial test files. void SaveToFile(const std::wstring& filename) { std::vector<unsigned char> compressed; - ASSERT_TRUE(PNGEncoder::Encode(&*data_.begin(), - PNGEncoder::FORMAT_BGRA, - width_, - height_, - row_length_, - true, - &compressed)); + ASSERT_TRUE(gfx::PNGCodec::Encode(&*data_.begin(), + gfx::PNGCodec::FORMAT_BGRA, + width_, + height_, + row_length_, + true, + &compressed)); ASSERT_TRUE(compressed.size()); FILE* f = file_util::OpenFile(filename, "wb"); ASSERT_TRUE(f); |