Committing on behalf of gman@chromium.org:

Fix for putImageData

TEST=manually ran tests that were failing
BUG=84165
TBR=reed@google.com

Code review URL: http://codereview.appspot.com/4570042

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

diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index dae1cd1..3c74b83 100644 (file)
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -1302,6 +1302,7 @@ void GrContext::writePixels(int left, int top, int width, int height,
     matrix.setTranslate(GrIntToScalar(left), GrIntToScalar(top));
     fGpu->setViewMatrix(matrix);
 
+    fGpu->setColorFilter(0, SkXfermode::kDst_Mode);
     fGpu->disableState(GrDrawTarget::kClip_StateBit);
     fGpu->setAlpha(0xFF);
     fGpu->setBlendFunc(kOne_BlendCoeff,