Factory methods for heap-allocated SkImageFilter objects.

gm/imagefiltersbase.cpp

 /*
  * Copyright 2011 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"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkTestImageFilters.h"
 
 class FailImageFilter : public SkImageFilter {
 public:
-    FailImageFilter() : INHERITED(0) {}
+    static FailImageFilter* Create() {
+        return SkNEW(FailImageFilter);
+    }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
 protected:
+    FailImageFilter() : INHERITED(0) {}
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
                                SkBitmap* result, SkIPoint* offset) const {
         return false;
     }
 
     FailImageFilter(SkReadBuffer& buffer)
       : INHERITED(1, buffer) {}
 
 private:
     typedef SkImageFilter INHERITED;
 };
 
 // register the filter with the flattenable registry
 static SkFlattenable::Registrar gFailImageFilterReg("FailImageFilter",
                                                     FailImageFilter::CreateProc,
                                                     FailImageFilter::GetFlattenableType());
 
 class IdentityImageFilter : public SkImageFilter {
 public:
-    IdentityImageFilter() : INHERITED(0) {}
+    static IdentityImageFilter* Create() {
+        return SkNEW(IdentityImageFilter);
+    }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
 protected:
+    IdentityImageFilter() : INHERITED(0) {}
     virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
                                SkBitmap* result, SkIPoint* offset) const {
         *result = src;
         return true;
     }
 
     IdentityImageFilter(SkReadBuffer& buffer)
       : INHERITED(1, buffer) {}
 
 private:
@@ skipping 123 matching lines @@
             draw_paint,
             draw_line, draw_rect, draw_path, draw_text,
             draw_bitmap,
             draw_sprite
         };
 
         SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorRED,
                                                      SkXfermode::kSrcIn_Mode);
         SkImageFilter* filters[] = {
             NULL,
-            new IdentityImageFilter,
-            new FailImageFilter,
+            IdentityImageFilter::Create(),
+            FailImageFilter::Create(),
             SkColorFilterImageFilter::Create(cf),
-            new SkBlurImageFilter(12.0f, 0.0f),
-            new SkDropShadowImageFilter(10.0f, 5.0f, 3.0f, SK_ColorBLUE),
+            SkBlurImageFilter::Create(12.0f, 0.0f),
+            SkDropShadowImageFilter::Create(10.0f, 5.0f, 3.0f, SK_ColorBLUE),
         };
         cf->unref();
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
         SkScalar MARGIN = SkIntToScalar(16);
         SkScalar DX = r.width() + MARGIN;
         SkScalar DY = r.height() + MARGIN;
 
         canvas->translate(MARGIN, MARGIN);
         for (size_t i = 0; i < SK_ARRAY_COUNT(drawProc); ++i) {
@@ skipping 14 matching lines @@
     }
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersBaseGM; }
 static skiagm::GMRegistry reg(MyFactory);