Merge "Fix fallthrough warning"

This commit is contained in:
Colin Cross
2019-10-31 22:20:40 +00:00
committed by Gerrit Code Review
2 changed files with 1 additions and 3 deletions

View File

@@ -234,9 +234,6 @@ cc_defaults {
"protos/graphicsstats.proto",
],
// Allow implicit fallthroughs in HardwareBitmapUploader.cpp until they are fixed.
cflags: ["-Wno-implicit-fallthrough"],
proto: {
export_proto_headers: true,
},

View File

@@ -302,6 +302,7 @@ static FormatInfo determineFormat(const SkBitmap& skBitmap, bool usingGL) {
switch (skBitmap.info().colorType()) {
case kRGBA_8888_SkColorType:
formatInfo.isSupported = true;
[[fallthrough]];
// ARGB_4444 is upconverted to RGBA_8888
case kARGB_4444_SkColorType:
formatInfo.pixelFormat = PIXEL_FORMAT_RGBA_8888;