summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 23:26:31 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 23:26:31 +0000
commitca33e969726b0ff6f1749d4dec117da2b9c4200b (patch)
tree338c6c00090249ec13517492826d7ab8ec38802e /base
parent2f24b5f1b04177643eaf173220cb4f9f5a33d347 (diff)
downloadchromium_src-ca33e969726b0ff6f1749d4dec117da2b9c4200b.zip
chromium_src-ca33e969726b0ff6f1749d4dec117da2b9c4200b.tar.gz
chromium_src-ca33e969726b0ff6f1749d4dec117da2b9c4200b.tar.bz2
Fix pngencoder mac perf errors - the previous code was never actually doing an input.empty() check.
BUG=none TEST=none TBR=nick Review URL: http://codereview.chromium.org/118343 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/gfx/png_encoder.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/base/gfx/png_encoder.cc b/base/gfx/png_encoder.cc
index 9ff4d61..cdc8fbc 100644
--- a/base/gfx/png_encoder.cc
+++ b/base/gfx/png_encoder.cc
@@ -201,10 +201,9 @@ bool PNGEncoder::EncodeBGRASkBitmap(const SkBitmap& input,
static const int bbp = 4;
SkAutoLockPixels lock_input(input);
- CHECK(!input.empty());
- CHECK(input.bytesPerPixel() == bbp);
- CHECK(input.getConfig() == SkBitmap::kARGB_8888_Config);
- CHECK(input.width() > 1 && input.height() > 1);
+ DCHECK(input.bytesPerPixel() == bbp);
+ DCHECK(input.getConfig() == SkBitmap::kARGB_8888_Config);
+ DCHECK(input.width() > 1 && input.height() > 1);
// SkBitmaps are premultiplied, we need to unpremultiply them.
scoped_array<unsigned char> divided(