Index: src/core/SkCanvas.cpp |
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp |
index 5b37e08b305aa0b68e1b03de25fc816d94a04a57..3a06d20ef50684c5067bf079991f5ece8358d8c0 100644 |
--- a/src/core/SkCanvas.cpp |
+++ b/src/core/SkCanvas.cpp |
@@ -519,19 +519,9 @@ SkCanvas::SkCanvas(SkBaseDevice* device) |
this->init(device, kDefault_InitFlags); |
} |
-SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props) |
+SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps* props) |
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage)) |
- , fProps(props) |
-{ |
- inc_canvas(); |
- |
- SkAutoTUnref<SkBaseDevice> device(SkNEW_ARGS(SkBitmapDevice, (bitmap))); |
- this->init(device, kDefault_InitFlags); |
-} |
- |
-SkCanvas::SkCanvas(const SkBitmap& bitmap) |
- : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage)) |
- , fProps(SkSurfaceProps::kLegacyFontHost_InitType) |
+ , fProps(SkSurfacePropsCopyOrDefault(props)) |
{ |
inc_canvas(); |