commit b3c20fa9a9cf453354c36d99c279bc033c594da2
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 03 21:20:19 2012 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jan 03 21:20:19 2012 +0000
tree 417df8b8eb4b776f20fccc5249ae9a553638c053
parent a14dd6db824bb391969181ae4a6bf89f57088390

Speculative fix to please the skia buildbots.  I couldn't repro the failure
locally, but I did get valgrind to point out some uninitialized data, which
this fix suppresses.

Build fix; unreviewed.



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

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 6e9b366..709aaba 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -450,6 +450,7 @@
         } else {
             SkColor filtered = colorFilter->filterColor(skPaint.getColor());
             grPaint->fColor = SkGr::SkColor2GrColor(filtered);
+            grPaint->resetColorFilter();
         }
     } else if (colorFilter != NULL && colorFilter->asColorMatrix(matrix)) {
         grPaint->fColorMatrixEnabled = true;