commit 069fd8e99666a8921c0a68fb0d4846c77dbea506
author markchien <markchien@google.com> Mon Oct 22 05:15:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 05:15:20 2018 -0700
tree 2de96de79dc6daf9a3bf4883076ac9fd23f8f0fe
parent 7430f3e6fd0eb7a39d0d782a347e358d85f6df50
parent 35d9291ca716d3acafc82cf74f4d166ac29af39f

Merge "Reduce excess local prefix computations"
am: 35d9291ca7

Change-Id: I15aadca0ff577fb6038e1aa8e9e40964309f042b

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 0ffd116..3c774a3 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -234,13 +234,13 @@
             gradientCache.clear();
             fontRenderer.clear();
             fboCache.clear();
-            [[fallthrough]];
+        // fall through
         case FlushMode::Moderate:
             fontRenderer.flush();
             textureCache.flush();
             pathCache.clear();
             tessellationCache.clear();
-            [[fallthrough]];
+        // fall through
         case FlushMode::Layers:
             renderBufferCache.clear();
             break;

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index cb50359..270527d5 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -331,8 +331,7 @@
     switch (info.colorType()) {
         case kRGBA_8888_SkColorType:
             isSupported = true;
-            // ARGB_4444 is upconverted to RGBA_8888
-            [[fallthrough]];
+        // ARGB_4444 is upconverted to RGBA_8888
         case kARGB_4444_SkColorType:
             pixelFormat = PIXEL_FORMAT_RGBA_8888;
             format = GL_RGBA;