summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image
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 /ui/gfx/image
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 'ui/gfx/image')
-rw-r--r--ui/gfx/image/image_unittest_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index 7349c7d..0d173a6 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -103,8 +103,8 @@ bool IsEqual(const SkBitmap& bmp1, const SkBitmap& bmp2) {
if (bmp1.width() != bmp2.width() ||
bmp1.height() != bmp2.height() ||
- bmp1.config() != SkBitmap::kARGB_8888_Config ||
- bmp2.config() != SkBitmap::kARGB_8888_Config) {
+ bmp1.colorType() != kN32_SkColorType ||
+ bmp2.colorType() != kN32_SkColorType) {
return false;
}