Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."

This commit is contained in:
Treehugger Robot
2018-10-20 01:08:55 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 3 deletions

View File

@@ -234,13 +234,13 @@ void Caches::flush(FlushMode mode) {
gradientCache.clear();
fontRenderer.clear();
fboCache.clear();
// fall through
[[fallthrough]];
case FlushMode::Moderate:
fontRenderer.flush();
textureCache.flush();
pathCache.clear();
tessellationCache.clear();
// fall through
[[fallthrough]];
case FlushMode::Layers:
renderBufferCache.clear();
break;

View File

@@ -331,7 +331,8 @@ sk_sp<Bitmap> SkiaOpenGLPipeline::allocateHardwareBitmap(renderthread::RenderThr
switch (info.colorType()) {
case kRGBA_8888_SkColorType:
isSupported = true;
// ARGB_4444 is upconverted to RGBA_8888
// ARGB_4444 is upconverted to RGBA_8888
[[fallthrough]];
case kARGB_4444_SkColorType:
pixelFormat = PIXEL_FORMAT_RGBA_8888;
format = GL_RGBA;