aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/SkCanvas.cpp
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-11-18 15:51:29 -0800
committerSteve Kondik <shade@chemlab.org>2012-11-18 15:51:29 -0800
commita0a3a4d3f7e368311d896eaca0a22732a81d37fb (patch)
treec4590b3f4713d99a0f55be9f270231ce56c98779 /src/core/SkCanvas.cpp
parent93df05afa45a51715db60aa88cc6ea11f232b3ea (diff)
parent7cd90d4eecdba0f40a36945749d40df95d6d641b (diff)
downloadexternal_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.zip
external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.gz
external_skia-a0a3a4d3f7e368311d896eaca0a22732a81d37fb.tar.bz2
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/skia into mr1-staging
Change-Id: I5cf0639d6ad25f58af4d5e0e480ee063148991f8
Diffstat (limited to 'src/core/SkCanvas.cpp')
-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)