Gpu Image Decode Controller

cc/resources/resource_format.cc

Index: cc/resources/resource_format.cc
diff --git a/cc/resources/resource_format.cc b/cc/resources/resource_format.cc
index ec553d8acbc9b062795f1880f11dffca620dc862..101aef484a65c8f55bffffa92554d109be5148fc 100644
--- a/cc/resources/resource_format.cc
+++ b/cc/resources/resource_format.cc
@@ -9,21 +9,24 @@
 
 namespace cc {
 
-SkColorType ResourceFormatToSkColorType(ResourceFormat format) {
+SkColorType ResourceFormatToClosestSkColorType(ResourceFormat format) {
+  // Use kN32_SkColorType if there is no corresponding SkColorType.
   switch (format) {
     case RGBA_4444:
       return kARGB_4444_SkColorType;
     case RGBA_8888:
     case BGRA_8888:
       return kN32_SkColorType;
-    case ETC1:
     case ALPHA_8:
-    case LUMINANCE_8:
+      return kAlpha_8_SkColorType;
     case RGB_565:
+      return kRGB_565_SkColorType;
+    case LUMINANCE_8:
+      return kGray_8_SkColorType;
+    case ETC1:
     case RED_8:
     case LUMINANCE_F16:
-      NOTREACHED();
-      break;
+      return kN32_SkColorType;
   }
   NOTREACHED();
   return kN32_SkColorType;