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

Commit de3ff4b4 authored by Jonathan Dixon's avatar Jonathan Dixon Committed by Android Git Automerger
Browse files

am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev 

* commit '42773328':
  Refactor Canvas.drawPicture() to delegate to Picture
parents 8418a309 42773328

core/jni/android/graphics/Canvas.cpp

+0 −17
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 


#include <utils/Log.h>



#define TIME_DRAWx



static uint32_t get_thread_msec() {

#if defined(HAVE_POSIX_CLOCKS)

    struct timespec tm;
@@ -463,20 +461,6 @@ public: 
        canvas->drawPath(*path, *paint);

    }

 

    static void drawPicture(JNIEnv* env, jobject, SkCanvas* canvas,

                            SkPicture* picture) {

        SkASSERT(canvas);

        SkASSERT(picture);

        

#ifdef TIME_DRAW

        SkMSec now = get_thread_msec(); //SkTime::GetMSecs();

#endif

        canvas->drawPicture(*picture);

#ifdef TIME_DRAW

        ALOGD("---- picture playback %d ms\n", get_thread_msec() - now);

#endif

    }



    static void drawBitmap__BitmapFFPaint(JNIEnv* env, jobject jcanvas,

                                          SkCanvas* canvas, SkBitmap* bitmap,

                                          jfloat left, jfloat top,
@@ -1103,7 +1087,6 @@ static JNINativeMethod gCanvasMethods[] = { 
        (void*) SkCanvasGlue::drawTextOnPath___CIIPathFFPaint},

    {"native_drawTextOnPath","(ILjava/lang/String;IFFII)V",

        (void*) SkCanvasGlue::drawTextOnPath__StringPathFFPaint},

    {"native_drawPicture", "(II)V", (void*) SkCanvasGlue::drawPicture},



    {"freeCaches", "()V", (void*) SkCanvasGlue::freeCaches},

graphics/java/android/graphics/Canvas.java

+3 −3
Original line number Diff line number Diff line
@@ -1646,7 +1646,9 @@ public class Canvas { 
     */

    public void drawPicture(Picture picture) {

        picture.endRecording();

        native_drawPicture(mNativeCanvas, picture.ni());

        int restoreCount = save();

        picture.draw(this);

        restoreToCount(restoreCount);

    }

    

    /**
@@ -1831,7 +1833,5 @@ public class Canvas { 
                                                     float hOffset, 

                                                     float vOffset, 

                                                     int flags, int paint);

    private static native void native_drawPicture(int nativeCanvas,

                                                  int nativePicture);

    private static native void finalizer(int nativeCanvas);

}

tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java

+0 −8
Original line number Diff line number Diff line
@@ -1147,14 +1147,6 @@ public final class Canvas_Delegate { 
                "Canvas.drawTextOnPath is not supported.", null, null /*data*/);

    }



    @LayoutlibDelegate

    /*package*/ static void native_drawPicture(int nativeCanvas,

                                                  int nativePicture) {

        // FIXME

        Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,

                "Canvas.drawPicture is not supported.", null, null /*data*/);

    }



    @LayoutlibDelegate

    /*package*/ static void finalizer(int nativeCanvas) {

        // get the delegate from the native int so that it can be disposed.