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

Merge "Adapt to latest skia"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-05-12 15:09:51 -07:00
committed by Android Code Review
parent 6714e67740 0ceb9501b2
commit f247e545b5
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.mk
View File

@@ -177,7 +177,6 @@ LOCAL_SHARED_LIBRARIES := \
libgui \ libgui \
libsurfaceflinger_client \ libsurfaceflinger_client \
libcamera_client \ libcamera_client \
libskiagl \
libskia \ libskia \
libsqlite \ libsqlite \
libdvm \ libdvm \

2
core/jni/android/graphics/BitmapRegionDecoder.cpp
View File

@@ -94,7 +94,7 @@ static jobject doBuildTileIndex(JNIEnv* env, SkStream* stream) {
return nullObjectReturn("decoder->buildTileIndex returned false"); return nullObjectReturn("decoder->buildTileIndex returned false");
} }
SkBitmapRegionDecoder *bm = new SkBitmapRegionDecoder(decoder, width, height); SkBitmapRegionDecoder *bm = new SkBitmapRegionDecoder(decoder, stream, width, height);
return GraphicsJNI::createBitmapRegionDecoder(env, bm); return GraphicsJNI::createBitmapRegionDecoder(env, bm);
} }

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

@@ -61,12 +61,11 @@ public:
} }
static SkCanvas* initGL(JNIEnv* env, jobject) { static SkCanvas* initGL(JNIEnv* env, jobject) {
return new SkGLCanvas; return 0;
} }
static void freeCaches(JNIEnv* env, jobject) { static void freeCaches(JNIEnv* env, jobject) {
// these are called in no particular order // these are called in no particular order
SkGLCanvas::DeleteAllTextures();
SkImageRef_GlobalPool::SetRAMUsed(0); SkImageRef_GlobalPool::SetRAMUsed(0);
SkGraphics::SetFontCacheUsed(0); SkGraphics::SetFontCacheUsed(0);
} }

1
core/jni/android_view_ViewRoot.cpp
View File

@@ -77,7 +77,6 @@ static void android_view_ViewRoot_showFPS(JNIEnv* env, jobject, jobject jcanvas,
} }
static void android_view_ViewRoot_abandonGlCaches(JNIEnv* env, jobject) { static void android_view_ViewRoot_abandonGlCaches(JNIEnv* env, jobject) {
SkGLCanvas::AbandonAllTextures();
} }