commit f5dbe2f00f853c6a1719924bdd0c33335a53423a
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 15 13:41:26 2011 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Apr 15 13:41:26 2011 +0000
tree 4244625eb50b4615a8f9016ee17ae2afb09e57f3
parent 61eb040e2f18d367c66c0bfc08d2707dc75f7cf2

Upstream android changes.

reviewed by: reed


git-svn-id: http://skia.googlecode.com/svn/trunk@1134 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkBlurDrawLooper.cpp

diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp
index 9290ead..bde04ed 100644
--- a/src/effects/SkBlurDrawLooper.cpp
+++ b/src/effects/SkBlurDrawLooper.cpp
@@ -73,7 +73,16 @@
                 fState = kDone;
                 return false;
             }
+#ifdef ANDROID
+            SkColor blurColor;
+            blurColor = fBlurColor;
+            if (SkColorGetA(blurColor) == 255) {
+                blurColor = SkColorSetA(blurColor, paint->getAlpha());
+            }
+            paint->setColor(blurColor);
+#else
             paint->setColor(fBlurColor);
+#endif
             paint->setMaskFilter(fBlur);
             paint->setColorFilter(fColorFilter);
             canvas->save(SkCanvas::kMatrix_SaveFlag);