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 /chrome/browser/thumbnail_store_unittest.cc | |
| 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 'chrome/browser/thumbnail_store_unittest.cc')
| -rw-r--r-- | chrome/browser/thumbnail_store_unittest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/thumbnail_store_unittest.cc b/chrome/browser/thumbnail_store_unittest.cc index cd249f3..e5a5be0 100644 --- a/chrome/browser/thumbnail_store_unittest.cc +++ b/chrome/browser/thumbnail_store_unittest.cc @@ -9,12 +9,12 @@ #include "chrome/browser/thumbnail_store.h" +#include "app/gfx/codec/jpeg_codec.h" #include "app/sql/connection.h" #include "app/sql/statement.h" #include "base/time.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/gfx/jpeg_codec.h" #include "base/path_service.h" #include "base/ref_counted.h" #include "chrome/common/chrome_paths.h" @@ -70,23 +70,25 @@ void ThumbnailStoreTest::SetUp() { db_name_ = db_name_.AppendASCII("ThumbnailDB"); file_util::Delete(db_name_, false); - google_.reset(JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail))); - weewar_.reset(JPEGCodec::Decode(kWeewarThumbnail, sizeof(kWeewarThumbnail))); + google_.reset(gfx::JPEGCodec::Decode(kGoogleThumbnail, + sizeof(kGoogleThumbnail))); + weewar_.reset(gfx::JPEGCodec::Decode(kWeewarThumbnail, + sizeof(kWeewarThumbnail))); SkAutoLockPixels lock1(*google_); jpeg_google_ = new RefCountedBytes; - JPEGCodec::Encode( + gfx::JPEGCodec::Encode( reinterpret_cast<unsigned char*>(google_->getAddr32(0, 0)), - JPEGCodec::FORMAT_BGRA, google_->width(), + gfx::JPEGCodec::FORMAT_BGRA, google_->width(), google_->height(), static_cast<int>(google_->rowBytes()), 90, &(jpeg_google_->data)); SkAutoLockPixels lock2(*weewar_); jpeg_weewar_ = new RefCountedBytes; - JPEGCodec::Encode( + gfx::JPEGCodec::Encode( reinterpret_cast<unsigned char*>(weewar_->getAddr32(0,0)), - JPEGCodec::FORMAT_BGRA, weewar_->width(), + gfx::JPEGCodec::FORMAT_BGRA, weewar_->width(), weewar_->height(), static_cast<int>(weewar_->rowBytes()), 90, &(jpeg_weewar_->data)); |