Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix USE_TEXT_LAYOUT_CACHE define

Browse Source 
- fix compilation issues

Change-Id: I3358457d94d2278804e81e4ca96c9633ed76a147
This commit is contained in:
Fabrice Di Meglio
2011-06-06 11:51:46 -07:00
parent 04a5a95450
commit af033caf26
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/android/graphics/Canvas.cpp
View File

@@ -755,32 +755,46 @@ public:
jfloat x, jfloat y, int flags, SkPaint* paint) {
jint count = end - start;
sp<TextLayoutCacheValue> value = gTextLayoutCache.getValue(
paint, textArray, start, count, end, flags);
sp<TextLayoutCacheValue> value;
#if USE_TEXT_LAYOUT_CACHE
value = gTextLayoutCache.getValue(paint, textArray, start, count, end, flags);
if (value == NULL) {
LOGE("Cannot get TextLayoutCache value");
return ;
}
#else
value = new TextLayoutCacheValue();
value->computeValues(paint, textArray, start, count, end, flags);
#endif
#if DEBUG_GLYPHS
logGlyphs(value);
#endif
doDrawGlyphs(canvas, value->getGlyphs(), 0, value->getGlyphsCount(),
x, y, flags, paint);
doDrawGlyphs(canvas, value->getGlyphs(), 0, value->getGlyphsCount(),
x, y, flags, paint);
}
static void drawTextWithGlyphs(SkCanvas* canvas, const jchar* textArray,
int start, int count, int contextCount,
jfloat x, jfloat y, int flags, SkPaint* paint) {
sp<TextLayoutCacheValue> value = gTextLayoutCache.getValue(
paint, textArray, start, count, contextCount, flags);
sp<TextLayoutCacheValue> value;
#if USE_TEXT_LAYOUT_CACHE
value = gTextLayoutCache.getValue(paint, textArray, start, count, contextCount, flags);
if (value == NULL) {
LOGE("Cannot get TextLayoutCache value");
return ;
}
#else
value = new TextLayoutCacheValue();
value->computeValues(paint, textArray, start, count, contextCount, flags);
#endif
#if DEBUG_GLYPHS
logGlyphs(value);
#endif
doDrawGlyphs(canvas, value->getGlyphs(), 0, value->getGlyphsCount(),
x, y, flags, paint);
}

20
core/jni/android/graphics/TextLayout.cpp
View File

@@ -254,21 +254,21 @@ void TextLayout::drawTextRun(SkPaint* paint, const jchar* chars,
void TextLayout::getTextRunAdvances(SkPaint* paint, const jchar* chars, jint start,
jint count, jint contextCount, jint dirFlags,
jfloat* resultAdvances, jfloat& resultTotalAdvance) {
sp<TextLayoutCacheValue> value;
#if USE_TEXT_LAYOUT_CACHE
// Return advances from the cache. Compute them if needed
sp<TextLayoutCacheValue> layout = gTextLayoutCache.getValue(
value = gTextLayoutCache.getValue(
paint, chars, start, count, contextCount, dirFlags);
if (layout != NULL) {
if (resultAdvances != NULL) {
memcpy(resultAdvances, layout->getAdvances(), layout->getAdvancesCount() * sizeof(jfloat));
}
resultTotalAdvance = layout->getTotalAdvance();
}
#else
// Compute advances and return them
TextLayoutCacheValue::computeValuesWithHarfbuzz(paint, chars, start, count, contextCount,
dirFlags, resultAdvances, &resultTotalAdvance, NULL, NULL );
value = new TextLayoutCacheValue();
value->computeValues(paint, chars, start, count, contextCount, dirFlags);
#endif
if (value != NULL) {
if (resultAdvances != NULL) {
memcpy(resultAdvances, value->getAdvances(), value->getAdvancesCount() * sizeof(jfloat));
}
resultTotalAdvance = value->getTotalAdvance();
}
}
void TextLayout::getTextRunAdvancesHB(SkPaint* paint, const jchar* chars, jint start,

18
core/jni/android_view_GLES20Canvas.cpp
View File

@@ -438,12 +438,17 @@ static void android_view_GLES20Canvas_setupShadow(JNIEnv* env, jobject clazz,
static void renderText(OpenGLRenderer* renderer, const jchar* text, int count,
jfloat x, jfloat y, int flags, SkPaint* paint) {
#if RTL_USE_HARFBUZZ
sp<TextLayoutCacheValue> value = gTextLayoutCache.getValue(
paint, text, 0, count, count, flags);
sp<TextLayoutCacheValue> value;
#if USE_TEXT_LAYOUT_CACHE
value = gTextLayoutCache.getValue(paint, text, 0, count, count, flags);
if (value == NULL) {
LOGE("Cannot get TextLayoutCache value");
return ;
}
#else
value = new TextLayoutCacheValue();
value->computeValues(paint, text, 0, count, count, flags);
#endif
#if DEBUG_GLYPHS
logGlyphs(value);
#endif
@@ -466,12 +471,17 @@ static void renderTextRun(OpenGLRenderer* renderer, const jchar* text,
jint start, jint count, jint contextCount, jfloat x, jfloat y,
int flags, SkPaint* paint) {
#if RTL_USE_HARFBUZZ
sp<TextLayoutCacheValue> value = gTextLayoutCache.getValue(
paint, text, start, count, contextCount, flags);
sp<TextLayoutCacheValue> value;
#if USE_TEXT_LAYOUT_CACHE
value = gTextLayoutCache.getValue(paint, text, start, count, contextCount, flags);
if (value == NULL) {
LOGE("Cannot get TextLayoutCache value");
return ;
}
#else
value = new TextLayoutCacheValue();
value->computeValues(paint, text, start, count, contextCount, flags);
#endif
#if DEBUG_GLYPHS
logGlyphs(value);
#endif