Unify edge type enums across GrEffect subclasses that clip rendering to a geometry.

gm/rrects.cpp

 /*
  * Copyright 2012 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
 #include "GrTest.h"
@@ skipping 59 matching lines @@
         SkBaseDevice* device = canvas->getTopDevice();
         GrContext* context = NULL;
         GrRenderTarget* rt = device->accessRenderTarget();
         if (NULL != rt) {
             context = rt->getContext();
         }
         if (kEffect_Type == fType && NULL == context) {
             return;
         }
         if (kEffect_Type == fType) {
-            numRRects *= GrRRectEffect::kEdgeTypeCnt;
+            numRRects *= kGrEffectEdgeTypeCnt;
         }
 #endif
 
         SkPaint paint;
         if (kAA_Draw_Type == fType) {
             paint.setAntiAlias(true);
         }
 
         static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX), SkIntToScalar(kTileY));
 
@@ skipping 13 matching lines @@
                         GrTestTarget tt;
                         context->getTestTarget(&tt);
                         if (NULL == tt.target()) {
                             SkDEBUGFAIL("Couldn't get Gr test target.");
                             return;
                         }
                         GrDrawState* drawState = tt.target()->drawState();
 
                         SkRRect rrect = fRRects[rrectIdx];
                         rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
-                        GrRRectEffect::EdgeType edgeType = (GrRRectEffect::EdgeType)
-                                                            (curRRect / kNumRRects);
+                        GrEffectEdgeType edgeType = (GrEffectEdgeType) (curRRect / kNumRRects);
                         SkAutoTUnref<GrEffectRef> effect(GrRRectEffect::Create(edgeType, rrect));
                         if (effect) {
                             drawState->addCoverageEffect(effect);
                             drawState->setIdentityViewMatrix();
                             drawState->setRenderTarget(rt);
                             drawState->setColor(0xff000000);
 
                             SkRect bounds = rrect.getBounds();
                             bounds.outset(2.f, 2.f);
 
@@ skipping 99 matching lines @@
 
 DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); )
 #if SK_SUPPORT_GPU
 DEF_GM( return new RRectGM(RRectGM::kEffect_Type); )
 #endif
 
 }