commit c5b5f0556b542a22f01d254e6284f69e9eb23e74
author Chris Craik <ccraik@google.com> Wed Oct 01 16:40:16 2014 -0700
committer Chris Craik <ccraik@google.com> Wed Oct 01 16:40:16 2014 -0700
tree a32d339947b3bd0663c59182770ba951ffa74863
parent ec89863adec09dbf980b2d2c90c0fa5e78ffa7a9

Account for colorfilter transparency in determining paint opacity

bug:17765601
Change-Id: I90d76ee199bb357c71fc8f537c1abfa20d848416

libs/hwui/Renderer.h

diff --git a/libs/hwui/Renderer.h b/libs/hwui/Renderer.h
index 9cedd5a..a2f8c05 100644
--- a/libs/hwui/Renderer.h
+++ b/libs/hwui/Renderer.h
@@ -17,12 +17,13 @@
 #ifndef ANDROID_HWUI_RENDERER_H
 #define ANDROID_HWUI_RENDERER_H
 
+#include <SkColorFilter.h>
+#include <SkPaint.h>
 #include <SkRegion.h>
 
 #include <utils/String8.h>
 
 #include "AssetAtlas.h"
-#include "SkPaint.h"
 
 namespace android {
 
@@ -81,6 +82,14 @@
                 && !paint.getColorFilter()
                 && getXfermode(paint.getXfermode()) == SkXfermode::kSrcOver_Mode;
     }
+
+    static bool isBlendedColorFilter(const SkColorFilter* filter) {
+        if (filter == NULL) {
+            return false;
+        }
+        return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0;
+    }
+
 // ----------------------------------------------------------------------------
 // Frame state operations
 // ----------------------------------------------------------------------------