From 674554fc36932ca50b15bba41ac6f650254d4e72 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Wed, 19 Feb 2014 16:47:32 +0000 Subject: Reapply "Refactor setting an SkPaint onto a hwui Layer." This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb. Change-Id: Ie807761231edf7c848b019931dccbf466208c0be --- libs/hwui/Layer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/hwui/Layer.cpp') diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index 70eeb39ac4ef..54ce64f4069d 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -131,8 +131,9 @@ void Layer::removeFbo(bool flush) { } } -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) { -- cgit v1.2.3-59-g8ed1b