diff options
| author | 2012-07-27 16:42:52 -0700 | |
|---|---|---|
| committer | 2012-07-27 16:42:52 -0700 | |
| commit | c3e4f0a72baff805b434fd6b24cb29b3dc68e98d (patch) | |
| tree | be3c9694082a4bdbd91aea41232df36b3c4c3ebf /libs/hwui/OpenGLRenderer.cpp | |
| parent | ab88f9864e67aca97df8dcca8e99c17854a54510 (diff) | |
| parent | c25259519f1b74bb62a2b051b74537f073436b5c (diff) | |
Merge "Rename drawGeneralText to drawText" into jb-mr1-dev
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 07281ccf19c9..d0d5af5e5b2d 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2421,7 +2421,7 @@ status_t OpenGLRenderer::drawPosText(const char* text, int bytesCount, int count return DrawGlInfo::kStatusDrew; } -status_t OpenGLRenderer::drawGeneralText(const char* text, int bytesCount, int count, +status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count, float x, float y, const float* positions, SkPaint* paint, float length) { if (text == NULL || count == 0 || mSnapshot->isIgnored() || (paint->getAlpha() * mSnapshot->alpha == 0 && paint->getXfermode() == NULL)) { @@ -2455,7 +2455,7 @@ status_t OpenGLRenderer::drawGeneralText(const char* text, int bytesCount, int c } #if DEBUG_GLYPHS - ALOGD("OpenGLRenderer drawGeneralText() with FontID=%d", + ALOGD("OpenGLRenderer drawText() with FontID=%d", SkTypeface::UniqueID(paint->getTypeface())); #endif |