diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-12 15:09:51 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-05-12 15:09:51 -0700 |
| commit | f247e545b521584bb778e79710c1e60ab814839e (patch) | |
| tree | 7488781f0bb9dc1ce3a37d8034c47638f44f42fb | |
| parent | 6714e6774063aae7a8a7a80c36c89ec60170cb27 (diff) | |
| parent | 0ceb9501b29cba97273ab983ba5d6efba037e75c (diff) | |
| download | frameworks_base-f247e545b521584bb778e79710c1e60ab814839e.zip frameworks_base-f247e545b521584bb778e79710c1e60ab814839e.tar.gz frameworks_base-f247e545b521584bb778e79710c1e60ab814839e.tar.bz2 | |
Merge "Adapt to latest skia"
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android/graphics/BitmapRegionDecoder.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 3 | ||||
| -rw-r--r-- | core/jni/android_view_ViewRoot.cpp | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 4f04531..bd0d9b9 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -177,7 +177,6 @@ LOCAL_SHARED_LIBRARIES := \ libgui \ libsurfaceflinger_client \ libcamera_client \ - libskiagl \ libskia \ libsqlite \ libdvm \ diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 91a8202..cb2ad74 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -94,7 +94,7 @@ static jobject doBuildTileIndex(JNIEnv* env, SkStream* stream) { 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); } diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 6c61689..c2365ff 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -61,12 +61,11 @@ public: } static SkCanvas* initGL(JNIEnv* env, jobject) { - return new SkGLCanvas; + return 0; } static void freeCaches(JNIEnv* env, jobject) { // these are called in no particular order - SkGLCanvas::DeleteAllTextures(); SkImageRef_GlobalPool::SetRAMUsed(0); SkGraphics::SetFontCacheUsed(0); } diff --git a/core/jni/android_view_ViewRoot.cpp b/core/jni/android_view_ViewRoot.cpp index 5173bb8..0b13ef9 100644 --- a/core/jni/android_view_ViewRoot.cpp +++ b/core/jni/android_view_ViewRoot.cpp @@ -77,7 +77,6 @@ static void android_view_ViewRoot_showFPS(JNIEnv* env, jobject, jobject jcanvas, } static void android_view_ViewRoot_abandonGlCaches(JNIEnv* env, jobject) { - SkGLCanvas::AbandonAllTextures(); } |