diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-02-14 01:35:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-14 01:35:53 +0000 |
| commit | 336fcac31ddccc7e7a6773d03e7cb17967ebb898 (patch) | |
| tree | 5dea64e7a016e9876ffd12b1498a0700052bd996 | |
| parent | 66a4d9cd33b2d253b71acaa9142c66be17ce66e4 (diff) | |
| parent | ebcacc785b0883c9435a3e850f790785fba93370 (diff) | |
| download | frameworks_base-336fcac31ddccc7e7a6773d03e7cb17967ebb898.zip frameworks_base-336fcac31ddccc7e7a6773d03e7cb17967ebb898.tar.gz frameworks_base-336fcac31ddccc7e7a6773d03e7cb17967ebb898.tar.bz2 | |
Merge "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 46784ce..886eb6e 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -733,7 +733,7 @@ public: } - static void drawText___CIIFFIPaint(JNIEnv* env, jobject, SkCanvas* canvas, + static void drawText___CIIFFPaint(JNIEnv* env, jobject, SkCanvas* canvas, jcharArray text, int index, int count, jfloat x, jfloat y, SkPaint* paint) { jchar* textArray = env->GetCharArrayElements(text, NULL); @@ -741,7 +741,7 @@ public: env->ReleaseCharArrayElements(text, textArray, JNI_ABORT); } - static void drawText__StringIIFFIPaint(JNIEnv* env, jobject, + static void drawText__StringIIFFPaint(JNIEnv* env, jobject, SkCanvas* canvas, jstring text, int start, int end, jfloat x, jfloat y, SkPaint* paint) { @@ -827,10 +827,10 @@ static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat l delete[] posPtr; } - static void drawTextRun___CIIIIFFIPaint( + static void drawTextRun___CIIIIFFPaint( JNIEnv* env, jobject, SkCanvas* canvas, jcharArray text, int index, int count, int contextIndex, int contextCount, - jfloat x, jfloat y, int dirFlags, SkPaint* paint) { + jfloat x, jfloat y, SkPaint* paint) { jchar* chars = env->GetCharArrayElements(text, NULL); drawTextWithGlyphs(canvas, chars + contextIndex, index - contextIndex, @@ -838,10 +838,10 @@ static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat l env->ReleaseCharArrayElements(text, chars, JNI_ABORT); } - static void drawTextRun__StringIIIIFFIPaint( + static void drawTextRun__StringIIIIFFPaint( JNIEnv* env, jobject obj, SkCanvas* canvas, jstring text, jint start, jint end, jint contextStart, jint contextEnd, - jfloat x, jfloat y, jint dirFlags, SkPaint* paint) { + jfloat x, jfloat y, SkPaint* paint) { jint count = end - start; jint contextCount = contextEnd - contextStart; @@ -1026,13 +1026,13 @@ static JNINativeMethod gCanvasMethods[] = { {"nativeDrawVertices", "(III[FI[FI[II[SIII)V", (void*)SkCanvasGlue::drawVertices}, {"native_drawText","(I[CIIFFI)V", - (void*) SkCanvasGlue::drawText___CIIFFIPaint}, + (void*) SkCanvasGlue::drawText___CIIFFPaint}, {"native_drawText","(ILjava/lang/String;IIFFI)V", - (void*) SkCanvasGlue::drawText__StringIIFFIPaint}, + (void*) SkCanvasGlue::drawText__StringIIFFPaint}, {"native_drawTextRun","(I[CIIIIFFI)V", - (void*) SkCanvasGlue::drawTextRun___CIIIIFFIPaint}, + (void*) SkCanvasGlue::drawTextRun___CIIIIFFPaint}, {"native_drawTextRun","(ILjava/lang/String;IIIIFFI)V", - (void*) SkCanvasGlue::drawTextRun__StringIIIIFFIPaint}, + (void*) SkCanvasGlue::drawTextRun__StringIIIIFFPaint}, {"native_drawPosText","(I[CII[FI)V", (void*) SkCanvasGlue::drawPosText___CII_FPaint}, {"native_drawPosText","(ILjava/lang/String;[FI)V", |