commit 674554fc36932ca50b15bba41ac6f650254d4e72
author Derek Sollenberger <djsollen@google.com> Wed Feb 19 16:47:32 2014 +0000
committer Derek Sollenberger <djsollen@google.com> Thu Feb 20 16:20:33 2014 -0500
tree ec0fc936ce4fdbd15d8bf6e15348676194855b8a
parent 96f0369b25811319398a268071eb147fe14a09e3

Reapply "Refactor setting an SkPaint onto a hwui Layer."

This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb.

Change-Id: Ie807761231edf7c848b019931dccbf466208c0be

libs/hwui/Layer.cpp

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 70eeb39..54ce64f 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -131,8 +131,9 @@
     }
 }
 
-void Layer::setPaint(SkPaint* paint) {
+void Layer::setPaint(const SkPaint* paint) {
     OpenGLRenderer::getAlphaAndModeDirect(paint, &alpha, &mode);
+    setColorFilter((paint) ? paint->getColorFilter() : NULL);
 }
 
 void Layer::setColorFilter(SkColorFilter* filter) {