summaryrefslogtreecommitdiff
path: root/libs/hwui/FontRenderer.cpp
diff options
context:
space:
mode:
author Derek Sollenberger <djsollen@google.com> 2013-12-10 12:28:58 -0500
committer Derek Sollenberger <djsollen@google.com> 2014-02-07 17:06:14 -0500
commit76d3a1b8d035d27bc80b0f2fc480a903bd001514 (patch)
treea6346bbf593d565d89990f0bddecd2a5df92de9d /libs/hwui/FontRenderer.cpp
parent8852ab4357ffb653bafb36f3b9272866834f7a72 (diff)
Removing SkiaColorFilter and inspecting the native object directly.
bug: 10650594 Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
-rw-r--r--libs/hwui/FontRenderer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index f907d64e9aa3..b79a3b0898b4 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -72,9 +72,9 @@ status_t TextSetupFunctor::operator ()(int what, void* data) {
break;
}
}
- renderer->setupDrawColorFilter();
+ renderer->setupDrawColorFilter(paint->getColorFilter());
renderer->setupDrawShader();
- renderer->setupDrawBlending(true, mode);
+ renderer->setupDrawBlending(paint);
renderer->setupDrawProgram();
renderer->setupDrawModelView(kModelViewMode_Translate, false,
0.0f, 0.0f, 0.0f, 0.0f, pureTranslate);
@@ -84,7 +84,7 @@ status_t TextSetupFunctor::operator ()(int what, void* data) {
// needed
renderer->setupDrawTexture(0);
renderer->setupDrawPureColorUniforms();
- renderer->setupDrawColorFilterUniforms();
+ renderer->setupDrawColorFilterUniforms(paint->getColorFilter());
renderer->setupDrawShaderUniforms(pureTranslate);
renderer->setupDrawTextGammaUniforms();