Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
index b4af220..5d71ab8 100644
--- a/src/images/SkDecodingImageGenerator.cpp
+++ b/src/images/SkDecodingImageGenerator.cpp
@@ -257,9 +257,8 @@
return NULL;
}
- return SkNEW_ARGS(DecodingImageGenerator,
- (data, autoStream.detach(), info.makeAlphaType(newAlphaType),
- opts.fSampleSize, opts.fDitherImage));
+ return new DecodingImageGenerator(data, autoStream.detach(), info.makeAlphaType(newAlphaType),
+ opts.fSampleSize, opts.fDitherImage);
}
} // namespace
@@ -273,7 +272,7 @@
if (NULL == data) {
return NULL;
}
- SkStreamRewindable* stream = SkNEW_ARGS(SkMemoryStream, (data));
+ SkStreamRewindable* stream = new SkMemoryStream(data);
SkASSERT(stream != NULL);
return CreateDecodingImageGenerator(data, stream, opts);
}
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 5b3cf32..0be295c 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -160,7 +160,7 @@
bool SkImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, int* /*width*/,
int* /*height*/) {
- SkDELETE(stream);
+ delete stream;
return false;
}
diff --git a/src/images/SkImageDecoder_FactoryRegistrar.cpp b/src/images/SkImageDecoder_FactoryRegistrar.cpp
index b47a6d5..68202a9 100644
--- a/src/images/SkImageDecoder_FactoryRegistrar.cpp
+++ b/src/images/SkImageDecoder_FactoryRegistrar.cpp
@@ -31,7 +31,7 @@
// if we are given a stream that does not support rewinding.
if (!rewindSuceeded) {
SkDEBUGF(("Unable to rewind the image stream."));
- SkDELETE(codec);
+ delete codec;
return NULL;
}
diff --git a/src/images/SkImageDecoder_astc.cpp b/src/images/SkImageDecoder_astc.cpp
index 869acfb..cb29b4d 100644
--- a/src/images/SkImageDecoder_astc.cpp
+++ b/src/images/SkImageDecoder_astc.cpp
@@ -186,7 +186,7 @@
static SkImageDecoder* sk_libastc_dfactory(SkStreamRewindable* stream) {
if (is_astc(stream)) {
- return SkNEW(SkASTCImageDecoder);
+ return new SkASTCImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp
index 837fe58..a7e1a70 100644
--- a/src/images/SkImageDecoder_ktx.cpp
+++ b/src/images/SkImageDecoder_ktx.cpp
@@ -309,7 +309,7 @@
static SkImageDecoder* sk_libktx_dfactory(SkStreamRewindable* stream) {
if (SkKTXFile::is_ktx(stream)) {
- return SkNEW(SkKTXImageDecoder);
+ return new SkKTXImageDecoder;
}
return NULL;
}
@@ -322,7 +322,7 @@
}
SkImageEncoder* sk_libktx_efactory(SkImageEncoder::Type t) {
- return (SkImageEncoder::kKTX_Type == t) ? SkNEW(SkKTXImageEncoder) : NULL;
+ return (SkImageEncoder::kKTX_Type == t) ? new SkKTXImageEncoder : NULL;
}
static SkImageDecoder_DecodeReg gReg(sk_libktx_dfactory);
diff --git a/src/images/SkImageDecoder_libbmp.cpp b/src/images/SkImageDecoder_libbmp.cpp
index 6647e1b..3884508 100644
--- a/src/images/SkImageDecoder_libbmp.cpp
+++ b/src/images/SkImageDecoder_libbmp.cpp
@@ -46,7 +46,7 @@
static SkImageDecoder* sk_libbmp_dfactory(SkStreamRewindable* stream) {
if (is_bmp(stream)) {
- return SkNEW(SkBMPImageDecoder);
+ return new SkBMPImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp
index 5d55a13..65172ac 100644
--- a/src/images/SkImageDecoder_libgif.cpp
+++ b/src/images/SkImageDecoder_libgif.cpp
@@ -365,7 +365,7 @@
fillIndex = 0; // If not, fix it.
}
- SkAutoTUnref<SkColorTable> ctable(SkNEW_ARGS(SkColorTable, (colorPtr, colorCount)));
+ SkAutoTUnref<SkColorTable> ctable(new SkColorTable(colorPtr, colorCount));
if (!this->allocPixelRef(bm, ctable)) {
return error_return(*bm, "allocPixelRef");
}
@@ -524,7 +524,7 @@
static SkImageDecoder* sk_libgif_dfactory(SkStreamRewindable* stream) {
if (is_gif(stream)) {
- return SkNEW(SkGIFImageDecoder);
+ return new SkGIFImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp
index b9b3fba..78f41d9 100644
--- a/src/images/SkImageDecoder_libico.cpp
+++ b/src/images/SkImageDecoder_libico.cpp
@@ -435,7 +435,7 @@
static SkImageDecoder* sk_libico_dfactory(SkStreamRewindable* stream) {
if (is_ico(stream)) {
- return SkNEW(SkICOImageDecoder);
+ return new SkICOImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 8e92dd8..d403b74 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -210,9 +210,7 @@
fImageHeight = 0;
}
- virtual ~SkJPEGImageDecoder() {
- SkDELETE(fImageIndex);
- }
+ virtual ~SkJPEGImageDecoder() { delete fImageIndex; }
#endif
Format getFormat() const override {
@@ -943,8 +941,7 @@
#ifdef SK_BUILD_FOR_ANDROID
bool SkJPEGImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, int *width, int *height) {
-
- SkAutoTDelete<SkJPEGImageIndex> imageIndex(SkNEW_ARGS(SkJPEGImageIndex, (stream, this)));
+ SkAutoTDelete<SkJPEGImageIndex> imageIndex(new SkJPEGImageIndex(stream, this));
skjpeg_error_mgr sk_err;
set_error_mgr(imageIndex->cinfo(), &sk_err);
@@ -1000,7 +997,7 @@
*height = fImageHeight;
}
- SkDELETE(fImageIndex);
+ delete fImageIndex;
fImageIndex = imageIndex.detach();
return true;
@@ -1437,7 +1434,7 @@
static SkImageDecoder* sk_libjpeg_dfactory(SkStreamRewindable* stream) {
if (is_jpeg(stream)) {
- return SkNEW(SkJPEGImageDecoder);
+ return new SkJPEGImageDecoder;
}
return NULL;
}
@@ -1450,7 +1447,7 @@
}
static SkImageEncoder* sk_libjpeg_efactory(SkImageEncoder::Type t) {
- return (SkImageEncoder::kJPEG_Type == t) ? SkNEW(SkJPEGImageEncoder) : NULL;
+ return (SkImageEncoder::kJPEG_Type == t) ? new SkJPEGImageEncoder : NULL;
}
static SkImageDecoder_DecodeReg gDReg(sk_libjpeg_dfactory);
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp
index 44aa8e2..bccdfc8 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -85,9 +85,7 @@
return kPNG_Format;
}
- virtual ~SkPNGImageDecoder() {
- SkDELETE(fImageIndex);
- }
+ virtual ~SkPNGImageDecoder() { delete fImageIndex; }
protected:
#ifdef SK_BUILD_FOR_ANDROID
@@ -723,7 +721,7 @@
*colorPtr++ = lastColor;
}
- *colorTablep = SkNEW_ARGS(SkColorTable, (colorStorage, colorCount));
+ *colorTablep = new SkColorTable(colorStorage, colorCount);
*reallyHasAlphap = reallyHasAlpha;
return true;
}
@@ -755,9 +753,9 @@
png_build_index(png_ptr);
if (fImageIndex) {
- SkDELETE(fImageIndex);
+ delete fImageIndex;
}
- fImageIndex = SkNEW_ARGS(SkPNGImageIndex, (streamDeleter.detach(), png_ptr, info_ptr));
+ fImageIndex = new SkPNGImageIndex(streamDeleter.detach(), png_ptr, info_ptr);
return true;
}
@@ -1271,7 +1269,7 @@
SkImageDecoder* sk_libpng_dfactory(SkStreamRewindable* stream) {
if (is_png(stream)) {
- return SkNEW(SkPNGImageDecoder);
+ return new SkPNGImageDecoder;
}
return NULL;
}
@@ -1284,7 +1282,7 @@
}
SkImageEncoder* sk_libpng_efactory(SkImageEncoder::Type t) {
- return (SkImageEncoder::kPNG_Type == t) ? SkNEW(SkPNGImageEncoder) : NULL;
+ return (SkImageEncoder::kPNG_Type == t) ? new SkPNGImageEncoder : NULL;
}
static SkImageDecoder_DecodeReg gDReg(sk_libpng_dfactory);
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index a7c9610..e0c1d64 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -657,7 +657,7 @@
}
// Magic matches, call decoder
- return SkNEW(SkWEBPImageDecoder);
+ return new SkWEBPImageDecoder;
}
static SkImageDecoder::Format get_format_webp(SkStreamRewindable* stream) {
@@ -669,7 +669,7 @@
}
static SkImageEncoder* sk_libwebp_efactory(SkImageEncoder::Type t) {
- return (SkImageEncoder::kWEBP_Type == t) ? SkNEW(SkWEBPImageEncoder) : NULL;
+ return (SkImageEncoder::kWEBP_Type == t) ? new SkWEBPImageEncoder : NULL;
}
static SkImageDecoder_DecodeReg gDReg(sk_libwebp_dfactory);
diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp
index 9e1a2aa..f407308 100644
--- a/src/images/SkImageDecoder_pkm.cpp
+++ b/src/images/SkImageDecoder_pkm.cpp
@@ -111,7 +111,7 @@
static SkImageDecoder* sk_libpkm_dfactory(SkStreamRewindable* stream) {
if (is_pkm(stream)) {
- return SkNEW(SkPKMImageDecoder);
+ return new SkPKMImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index b7a6790..82127c3 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -119,7 +119,7 @@
}
const SkPMColor colors[] = { SK_ColorBLACK, SK_ColorWHITE };
- SkColorTable* ct = SkNEW_ARGS(SkColorTable, (colors, 2));
+ SkColorTable* ct = new SkColorTable(colors, 2);
SkAutoUnref aur(ct);
if (!this->allocPixelRef(decodedBitmap, ct)) {
@@ -156,7 +156,7 @@
wbmp_head head;
if (head.init(stream)) {
- return SkNEW(SkWBMPImageDecoder);
+ return new SkWBMPImageDecoder;
}
return NULL;
}
diff --git a/src/images/SkMovie_gif.cpp b/src/images/SkMovie_gif.cpp
index 380aca4..c40f552 100644
--- a/src/images/SkMovie_gif.cpp
+++ b/src/images/SkMovie_gif.cpp
@@ -443,7 +443,7 @@
memcmp(GIF89_STAMP, buf, GIF_STAMP_LEN) == 0) {
// must rewind here, since our construct wants to re-read the data
stream->rewind();
- return SkNEW_ARGS(SkGIFMovie, (stream));
+ return new SkGIFMovie(stream);
}
}
return NULL;