diff options
| author | 2014-02-19 16:47:32 +0000 | |
|---|---|---|
| committer | 2014-02-20 16:20:33 -0500 | |
| commit | 674554fc36932ca50b15bba41ac6f650254d4e72 (patch) | |
| tree | ec0fc936ce4fdbd15d8bf6e15348676194855b8a /libs/hwui/Layer.cpp | |
| parent | 96f0369b25811319398a268071eb147fe14a09e3 (diff) | |
Reapply "Refactor setting an SkPaint onto a hwui Layer."
This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb.
Change-Id: Ie807761231edf7c848b019931dccbf466208c0be
Diffstat (limited to 'libs/hwui/Layer.cpp')
| -rw-r--r-- | libs/hwui/Layer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |