Index: src/svg/SkSVGDevice.cpp |
diff --git a/experimental/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp |
similarity index 98% |
rename from experimental/svg/SkSVGDevice.cpp |
rename to src/svg/SkSVGDevice.cpp |
index 8d4ee4c05a720e8f61bca75ab1d2e320ae6bb458..bf19a81a1d3670ef193836d668660bbb7f72464d 100644 |
--- a/experimental/svg/SkSVGDevice.cpp |
+++ b/src/svg/SkSVGDevice.cpp |
@@ -471,17 +471,18 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) { |
} |
} |
-SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkWStream* wstream) { |
- if (!SkToBool(wstream)) { |
+SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkXMLWriter* writer) { |
+ if (!writer) { |
return NULL; |
} |
- return SkNEW_ARGS(SkSVGDevice, (size, wstream)); |
+ return SkNEW_ARGS(SkSVGDevice, (size, writer)); |
} |
-SkSVGDevice::SkSVGDevice(const SkISize& size, SkWStream* wstream) |
- : fWriter(SkNEW_ARGS(SkXMLStreamWriter, (wstream))) |
+SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) |
+ : fWriter(writer) |
, fResourceBucket(SkNEW(ResourceBucket)) { |
+ SkASSERT(writer); |
fLegacyBitmap.setInfo(SkImageInfo::MakeUnknown(size.width(), size.height())); |