aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2012-08-20 05:03:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-20 05:03:18 -0700
commit8ab6679ce80dafa0d97c426c9fe70c6b6ceb20e6 (patch)
treecdfeb40215669eae4f723ffd88230b14c5652ccb
parentf6067133f37c4b3f7ec653032b1432506be758fd (diff)
parent99180756367573f1d741a5104ed401c5a7308ae9 (diff)
downloadexternal_skia-8ab6679ce80dafa0d97c426c9fe70c6b6ceb20e6.zip
external_skia-8ab6679ce80dafa0d97c426c9fe70c6b6ceb20e6.tar.gz
external_skia-8ab6679ce80dafa0d97c426c9fe70c6b6ceb20e6.tar.bz2
Merge "Ensure SkCanvas will have a device by default." into jb-mr1-dev
-rw-r--r--src/core/SkCanvas.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 7861636..0e26728 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -425,7 +425,8 @@ SkCanvas::SkCanvas()
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage)) {
inc_canvas();
- this->init(NULL);
+ SkBitmap bitmap;
+ this->init(SkNEW_ARGS(SkDevice, (bitmap)))->unref();
}
SkCanvas::SkCanvas(SkDevice* device)