summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 19:09:47 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 19:09:47 +0000
commit3fa5258463086cc5606c3e8363d0ded6ff88c1d4 (patch)
tree5414dff2b584e46d80faa8aea209afdc93cb5d95 /skia
parent5486040573bf9adf4e79cf68be20c85e68907740 (diff)
downloadchromium_src-3fa5258463086cc5606c3e8363d0ded6ff88c1d4.zip
chromium_src-3fa5258463086cc5606c3e8363d0ded6ff88c1d4.tar.gz
chromium_src-3fa5258463086cc5606c3e8363d0ded6ff88c1d4.tar.bz2
SkBitmap::Config is deprecated, use SkColorType instead
BUG=skia:2706 Review URL: https://codereview.chromium.org/374633002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/vector_platform_device_emf_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc
index af245cd..f306316 100644
--- a/skia/ext/vector_platform_device_emf_win.cc
+++ b/skia/ext/vector_platform_device_emf_win.cc
@@ -895,7 +895,7 @@ void VectorPlatformDeviceEmf::InternalDrawBitmap(const SkBitmap& bitmap,
bitmap_header.bV4AlphaMask = 0xff000000;
SkAutoLockPixels lock(bitmap);
- SkASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config);
+ SkASSERT(bitmap.colorType() == kN32_SkColorType);
const uint32_t* pixels = static_cast<const uint32_t*>(bitmap.getPixels());
if (pixels == NULL) {
SkASSERT(false);