Style Change: SkNEW->new; SkDELETE->delete

gm/dcshader.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #if SK_SUPPORT_GPU
@@ skipping 32 matching lines @@
     }
 #endif
 
 private:
     const SkMatrix fDeviceMatrix;
 };
 
 SkFlattenable* DCShader::CreateProc(SkReadBuffer& buf) {
     SkMatrix matrix;
     buf.readMatrix(&matrix);
-    return SkNEW_ARGS(DCShader, (matrix));
+    return new DCShader(matrix);
 }
 
 class DCFP : public GrFragmentProcessor {
 public:
     DCFP(GrProcessorDataManager*, const SkMatrix& m) : fDeviceTransform(kDevice_GrCoordSet, m) {
         this->addCoordTransform(&fDeviceTransform);
         this->initClassID<DCFP>();
     }
 
     GrGLFragmentProcessor* onCreateGLInstance() const override {
         class DCGLFP : public GrGLFragmentProcessor {
             void emitCode(EmitArgs& args) override {
                 GrGLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder();
                 fpb->codeAppendf("vec2 c = %s;", fpb->ensureFSCoords2D(args.fCoords, 0).c_str());
                 fpb->codeAppend("vec2 r = mod(c, vec2(20.0));");
                 fpb->codeAppend("vec4 color = vec4(0.5*sin(c.x / 15.0) + 0.5,"
                                                     "0.5*cos((c.x + c.y) / 15.0) + 0.5,"
                                                     "(r.x + r.y) / 20.0,"
                                                     "distance(r, vec2(15.0)) / 20.0 + 0.2);");
                 fpb->codeAppendf("color.rgb *= color.a;"
                                     "%s = color * %s;",
                                     args.fOutputColor, GrGLSLExpr4(args.fInputColor).c_str());
             }
             void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override {}
         };
-        return SkNEW(DCGLFP);
+        return new DCGLFP;
     }
 
     const char* name() const override { return "DCFP"; }
 
     void onComputeInvariantOutput(GrInvariantOutput* inout) const override {
         inout->mulByUnknownFourComponents();
     }
 
 private:
     void onGetGLProcessorKey(const GrGLSLCaps& caps,
                              GrProcessorKeyBuilder* b) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     GrCoordTransform fDeviceTransform;
 };
 
 bool DCShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix& viewM,
                                    const SkMatrix* localMatrix, GrColor* color,
                                    GrProcessorDataManager* procDataManager,
                                    GrFragmentProcessor** fp) const {
-    *fp = SkNEW_ARGS(DCFP, (procDataManager, fDeviceMatrix));
+    *fp = new DCFP(procDataManager, fDeviceMatrix);
     *color = GrColorPackA4(paint.getAlpha());
     return true;
 }
 
 class DCShaderGM : public GM {
 public:
     DCShaderGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFAABBCC));
     }
 
     ~DCShaderGM() override {
         for (int i = 0; i < fPrims.count(); ++i) {
-            SkDELETE(fPrims[i]);
+            delete fPrims[i];
         }
     }
 
 protected:
 
     SkString onShortName() override {
         return SkString("dcshader");
     }
 
     SkISize onISize() override { return SkISize::Make(1000, 900); }
@@ skipping 80 matching lines @@
                 return bounds;
             }
 
             virtual void setFont(SkPaint* paint) {
                 sk_tool_utils::set_portable_typeface(paint);
             }
 
             virtual const char* text() const { return "Hello, Skia!"; }
         };
 
-        fPrims.push_back(SkNEW(Rect));
-        fPrims.push_back(SkNEW(Circle));
-        fPrims.push_back(SkNEW(RRect));
-        fPrims.push_back(SkNEW(DRRect));
-        fPrims.push_back(SkNEW(Path));
-        fPrims.push_back(SkNEW(Points(SkCanvas::kPoints_PointMode)));
-        fPrims.push_back(SkNEW(Points(SkCanvas::kLines_PointMode)));
-        fPrims.push_back(SkNEW(Points(SkCanvas::kPolygon_PointMode)));
-        fPrims.push_back(SkNEW(Text));
+        fPrims.push_back(new Rect);
+        fPrims.push_back(new Circle);
+        fPrims.push_back(new RRect);
+        fPrims.push_back(new DRRect);
+        fPrims.push_back(new Path);
+        fPrims.push_back(new Points(SkCanvas::kPoints_PointMode));
+        fPrims.push_back(new Points(SkCanvas::kLines_PointMode));
+        fPrims.push_back(new Points(SkCanvas::kPolygon_PointMode));
+        fPrims.push_back(new Text);
     }
 
     void onDraw(SkCanvas* canvas) override {
         // This GM exists to test a specific feature of the GPU backend. It does not work with the
         // sw rasterizer, tile modes, etc.
         if (NULL == canvas->getGrContext()) {
             this->drawGpuOnlyMessage(canvas);
             return;
         }
         SkPaint paint;
@@ skipping 12 matching lines @@
 
         canvas->translate(10, 20);
         canvas->save();
         SkScalar tx = 0, maxTy = 0;
         static const SkScalar kW = 900;
 
         for (int aa = 0; aa < 2; ++aa) {
             for (int i = 0; i < fPrims.count(); ++i) {
                 for (int j = 0; j < devMats.count(); ++j) {
                     for (int k = 0; k < viewMats.count(); ++k) {
-                        paint.setShader(SkNEW_ARGS(DCShader, (devMats[j])))->unref();
+                        paint.setShader(new DCShader(devMats[j]))->unref();
                         paint.setAntiAlias(SkToBool(aa));
                         canvas->save();
                         canvas->concat(viewMats[k]);
                         SkRect bounds = fPrims[i]->draw(canvas, paint);
                         canvas->restore();
                         viewMats[k].mapRect(&bounds);
                         // add margins
                         bounds.fRight += 20;
                         bounds.fBottom += 20;
                         canvas->translate(bounds.fRight, 0);
@@ skipping 17 matching lines @@
     struct Prim {
         virtual ~Prim() {}
         virtual SkRect draw(SkCanvas*, const SkPaint&) = 0;
     };
 
     SkTArray<Prim*> fPrims;
 
     typedef GM INHERITED;
 };
 
-DEF_GM( return SkNEW(DCShaderGM); )
+DEF_GM(return new DCShaderGM;)
 }
 #endif