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

Commit 7a5583fe authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android Git Automerger
Browse files

am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some... 

am 8225c5b3: am c37b63d6: Merge "Ensure that a canvas is always backed by some form of SkDevice." into jb-mr2-dev

* commit '8225c5b3':
  Ensure that a canvas is always backed by some form of SkDevice.
parents 54977db2 8225c5b3

core/jni/android/graphics/Canvas.cpp

+8 −1
Original line number Diff line number Diff line
@@ -77,7 +77,14 @@ public: 
    }



    static SkCanvas* initRaster(JNIEnv* env, jobject, SkBitmap* bitmap) {

        return bitmap ? new SkCanvas(*bitmap) : new SkCanvas;

        if (bitmap) {

            return new SkCanvas(*bitmap);

        } else {

            // Create an empty bitmap device to prevent callers from crashing

            // if they attempt to draw into this canvas.

            SkBitmap emptyBitmap;

            return new SkCanvas(emptyBitmap);

        }

    }

    

    static void copyCanvasState(JNIEnv* env, jobject clazz,