summaryrefslogtreecommitdiffstats
path: root/chromium/cc/resources/resource_format.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc/resources/resource_format.cc')
-rw-r--r--chromium/cc/resources/resource_format.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/cc/resources/resource_format.cc b/chromium/cc/resources/resource_format.cc
index 35617174cb5..273085604a4 100644
--- a/chromium/cc/resources/resource_format.cc
+++ b/chromium/cc/resources/resource_format.cc
@@ -6,13 +6,13 @@
namespace cc {
-SkBitmap::Config SkBitmapConfig(ResourceFormat format) {
+SkColorType ResourceFormatToSkColorType(ResourceFormat format) {
switch (format) {
case RGBA_4444:
- return SkBitmap::kARGB_4444_Config;
+ return kARGB_4444_SkColorType;
case RGBA_8888:
case BGRA_8888:
- return SkBitmap::kARGB_8888_Config;
+ return kPMColor_SkColorType;
case ETC1:
case LUMINANCE_8:
case RGB_565:
@@ -20,7 +20,7 @@ SkBitmap::Config SkBitmapConfig(ResourceFormat format) {
break;
}
NOTREACHED();
- return SkBitmap::kARGB_8888_Config;
+ return kPMColor_SkColorType;
}
} // namespace cc