diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 01:50:07 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 01:50:07 +0000 |
| commit | 9b4cd1b5eff9385649c0f4eb781f513ed82bb8e7 (patch) | |
| tree | 31247181a0d7cccebfde1808f817af17590d4cbd | |
| parent | 1c37204f3a91515d2df8af6ed7659e46f48725d6 (diff) | |
| download | chromium_src-9b4cd1b5eff9385649c0f4eb781f513ed82bb8e7.zip chromium_src-9b4cd1b5eff9385649c0f4eb781f513ed82bb8e7.tar.gz chromium_src-9b4cd1b5eff9385649c0f4eb781f513ed82bb8e7.tar.bz2 | |
Add a missing status DCHECK and convert another to DCHECK_EQ.
Found while trying to debug what's going wrong with Android layout
tests on my N4.
BUG=none
TEST=content_shell_apk
Review URL: https://chromiumcodereview.appspot.com/18112002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209266 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/shell/renderer/webkit_test_runner.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 6f7b01d..94b5619 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -104,7 +104,7 @@ void InvokeTaskHelper(void* context) { #if !defined(OS_MACOSX) void MakeBitmapOpaque(SkBitmap* bitmap) { SkAutoLockPixels lock(*bitmap); - DCHECK(bitmap->config() == SkBitmap::kARGB_8888_Config); + DCHECK_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config); for (int y = 0; y < bitmap->height(); ++y) { uint32_t* row = bitmap->getAddr32(0, y); for (int x = 0; x < bitmap->width(); ++x) @@ -116,7 +116,8 @@ void MakeBitmapOpaque(SkBitmap* bitmap) { void CopyCanvasToBitmap(SkCanvas* canvas, SkBitmap* snapshot) { SkDevice* device = skia::GetTopDevice(*canvas); const SkBitmap& bitmap = device->accessBitmap(false); - bitmap.copyTo(snapshot, SkBitmap::kARGB_8888_Config); + const bool success = bitmap.copyTo(snapshot, SkBitmap::kARGB_8888_Config); + DCHECK(success); #if !defined(OS_MACOSX) // Only the expected PNGs for Mac have a valid alpha channel. |