Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f247e545 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Adapt to latest skia"

parents 6714e677 0ceb9501

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libgui \

	libsurfaceflinger_client \

	libcamera_client \

	libskiagl \

	libskia \

	libsqlite \

	libdvm \

core/jni/android/graphics/BitmapRegionDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

core/jni/android/graphics/Canvas.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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);

    }

core/jni/android_view_ViewRoot.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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();

}