diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 21:26:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 21:26:30 +0000 |
| commit | bf27a7e84910aff2fa84c8c9b889e36007a53757 (patch) | |
| tree | 5f446df8ec13ab4004b7297456ea33cc2b8e910b /printing | |
| parent | 997344685ebfa8e6846e1674bcf032f0a9949688 (diff) | |
| download | chromium_src-bf27a7e84910aff2fa84c8c9b889e36007a53757.zip chromium_src-bf27a7e84910aff2fa84c8c9b889e36007a53757.tar.gz chromium_src-bf27a7e84910aff2fa84c8c9b889e36007a53757.tar.bz2 | |
SkBitmap::Config is no more, use SkColorType
When this lands, we can remove SkBitmap::Config entirely from Skia
TBR=kmadhusu@chromium.org
mac_chromium_rel failure is unrelated to this CL (and passes locally)
NOTRY=True
Review URL: https://codereview.chromium.org/382623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/emf_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc index 3003a2f..d9472f9 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -409,7 +409,7 @@ bool Emf::Record::SafePlayback(Emf::EnumerationContext* context) const { DCHECK(bitmap.get()); if (bitmap.get()) { SkAutoLockPixels lock(*bitmap.get()); - DCHECK_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config); + DCHECK_EQ(bitmap->colorType(), kN32_SkColorType); const uint32_t* pixels = static_cast<const uint32_t*>(bitmap->getPixels()); if (pixels == NULL) { |