commit 7a5583fe36f0686daecd961d4b2de090a000deac
author Derek Sollenberger <djsollen@google.com> Wed Apr 10 05:18:41 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 10 05:18:41 2013 -0700
tree 07247942c2b069e77f67f17a4eddff7666a020d9
parent 54977db25a46edb0fb0467a41498e6aad8380acc
parent 8225c5b3d925324dac7703fba0fd5a0f126afed6

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

* commit '8225c5b3d925324dac7703fba0fd5a0f126afed6':
  Ensure that a canvas is always backed by some form of SkDevice.

core/jni/android/graphics/Canvas.cpp

diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp
index 9a9f6c8..11c7053 100644
--- a/core/jni/android/graphics/Canvas.cpp
+++ b/core/jni/android/graphics/Canvas.cpp
@@ -77,7 +77,14 @@
     }
 
     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,