Remove static effects from the effect memory pool.

src/gpu/GrAAHairLinePathRenderer.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 "GrAAHairLinePathRenderer.h"
 
@@ skipping 490 matching lines @@
  * The output of this effect is a hairline edge for quadratics.
  * Quadratic specified by 0=u^2-v canonical coords. u and v are the first
  * two components of the vertex attribute. Uses unsigned distance.
  * Coverage is min(0, 1-distance). 3rd & 4th component unused.
  * Requires shader derivative instruction support.
  */
 class HairQuadEdgeEffect : public GrEffect {
 public:
 
     static GrEffectRef* Create() {
-        // we go through this so we only have one copy of each effect
-        static SkAutoTUnref<GrEffectRef> gHairQuadEdgeEffectRef(
-                         CreateEffectRef(AutoEffectUnref(SkNEW(HairQuadEdgeEffect))));
-
-        gHairQuadEdgeEffectRef.get()->ref();
-        return gHairQuadEdgeEffectRef;
+        GR_CREATE_STATIC_EFFECT(gHairQuadEdgeEffect, HairQuadEdgeEffect, ());
+        gHairQuadEdgeEffect->ref();
+        return gHairQuadEdgeEffect;
     }
 
     virtual ~HairQuadEdgeEffect() {}
 
     static const char* Name() { return "HairQuadEdge"; }
 
     virtual void getConstantColorComponents(GrColor* color,
                                             uint32_t* validFlags) const SK_OVERRIDE {
         *validFlags = 0;
     }
@@ skipping 75 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
  * The output of this effect is a 1-pixel wide line.
  * Input is 2D implicit device coord line eq (a*x + b*y +c = 0). 4th component unused.
  */
 class HairLineEdgeEffect : public GrEffect {
 public:
 
     static GrEffectRef* Create() {
-        // we go through this so we only have one copy of each effect
-        static SkAutoTUnref<GrEffectRef> gHairLineEdgeEffectRef(
-                            CreateEffectRef(AutoEffectUnref(SkNEW(HairLineEdgeEffect))));
-
-        gHairLineEdgeEffectRef.get()->ref();
-        return gHairLineEdgeEffectRef;
+        GR_CREATE_STATIC_EFFECT(gHairLineEdge, HairLineEdgeEffect, ());
+        gHairLineEdge->ref();
+        return gHairLineEdge;
     }
 
     virtual ~HairLineEdgeEffect() {}
 
     static const char* Name() { return "HairLineEdge"; }
 
     virtual void getConstantColorComponents(GrColor* color,
                                             uint32_t* validFlags) const SK_OVERRIDE {
         *validFlags = 0;
     }
@@ skipping 216 matching lines @@
                             4 * lineCnt + kVertsPerQuad*quads, // startV
                             0,                                 // startI
                             kVertsPerQuad*n,                   // vCount
                             kIdxsPerQuad*n);                   // iCount
         quads += n;
     }
     target->resetIndexSource();
 
     return true;
 }