diff options
author | halcanary <halcanary@google.com> | 2015-08-26 13:07:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 13:07:49 -0700 |
commit | 385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch) | |
tree | 53d982ff238828331e86acd44071a44162a8688c /src/svg | |
parent | 5015176adf046ef906a2313b6e6b64b72cc84898 (diff) |
Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
Diffstat (limited to 'src/svg')
-rw-r--r-- | src/svg/SkSVGCanvas.cpp | 2 | ||||
-rw-r--r-- | src/svg/SkSVGDevice.cpp | 8 | ||||
-rw-r--r-- | src/svg/skp2svg.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/svg/SkSVGCanvas.cpp b/src/svg/SkSVGCanvas.cpp index 22a6e0bd9c..b6634b8a1d 100644 --- a/src/svg/SkSVGCanvas.cpp +++ b/src/svg/SkSVGCanvas.cpp @@ -13,5 +13,5 @@ SkCanvas* SkSVGCanvas::Create(const SkRect& bounds, SkXMLWriter* writer) { SkISize size = bounds.roundOut().size(); SkAutoTUnref<SkBaseDevice> device(SkSVGDevice::Create(size, writer)); - return SkNEW_ARGS(SkCanvas, (device)); + return new SkCanvas(device); } diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp index 64f74c8b5b..a3f8af747e 100644 --- a/src/svg/SkSVGDevice.cpp +++ b/src/svg/SkSVGDevice.cpp @@ -290,7 +290,7 @@ public: if (!res.fClip.isEmpty()) { // The clip is in device space. Apply it via a <g> wrapper to avoid local transform // interference. - fClipGroup.reset(SkNEW_ARGS(AutoElement, ("g", fWriter))); + fClipGroup.reset(new AutoElement("g", fWriter)); fClipGroup->addAttribute("clip-path",res.fClip); } @@ -566,13 +566,13 @@ SkBaseDevice* SkSVGDevice::Create(const SkISize& size, SkXMLWriter* writer) { return NULL; } - return SkNEW_ARGS(SkSVGDevice, (size, writer)); + return new SkSVGDevice(size, writer); } SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) : INHERITED(SkSurfaceProps(0, kUnknown_SkPixelGeometry)) , fWriter(writer) - , fResourceBucket(SkNEW(ResourceBucket)) { + , fResourceBucket(new ResourceBucket) { SkASSERT(writer); fLegacyBitmap.setInfo(SkImageInfo::MakeUnknown(size.width(), size.height())); @@ -580,7 +580,7 @@ SkSVGDevice::SkSVGDevice(const SkISize& size, SkXMLWriter* writer) fWriter->writeHeader(); // The root <svg> tag gets closed by the destructor. - fRootElement.reset(SkNEW_ARGS(AutoElement, ("svg", fWriter))); + fRootElement.reset(new AutoElement("svg", fWriter)); fRootElement->addAttribute("xmlns", "http://www.w3.org/2000/svg"); fRootElement->addAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink"); diff --git a/src/svg/skp2svg.cpp b/src/svg/skp2svg.cpp index ae6e54c885..2bfb6871be 100644 --- a/src/svg/skp2svg.cpp +++ b/src/svg/skp2svg.cpp @@ -45,17 +45,17 @@ int tool_main(int argc, char** argv) { SkAutoTDelete<SkWStream> outStream; if (FLAGS_output.count() > 0) { - SkFILEWStream* fileStream = SkNEW_ARGS(SkFILEWStream, (FLAGS_output[0])); + SkFILEWStream* fileStream = new SkFILEWStream(FLAGS_output[0]); if (!fileStream->isValid()) { SkDebugf("Couldn't open output file for writing: %s\n", FLAGS_output[0]); return kIOError; } outStream.reset(fileStream); } else { - outStream.reset(SkNEW(SkDebugWStream)); + outStream.reset(new SkDebugWStream); } - SkAutoTDelete<SkXMLWriter> xmlWriter(SkNEW_ARGS(SkXMLStreamWriter, (outStream.get()))); + SkAutoTDelete<SkXMLWriter> xmlWriter(new SkXMLStreamWriter(outStream.get())); SkAutoTUnref<SkCanvas> svgCanvas(SkSVGCanvas::Create(pic->cullRect(), xmlWriter.get())); pic->playback(svgCanvas); |