commit cabf4b2f3664b98c1084fbb94a999af15ddfb52d
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 05 18:27:43 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 05 18:27:43 2014 +0000
tree 6458dbcdcb2fee1cc626923dafcff021d0b855be
parent dcb8e54ffdc9194744c0ec839969102bd0f582c6

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

BUG=skia:
R=egdaniel@google.com, robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/183893023

git-svn-id: http://skia.googlecode.com/svn/trunk@13674 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/rrects.cpp

diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index d92fb5a..7bc7c19 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -77,7 +77,7 @@
             return;
         }
         if (kEffect_Type == fType) {
-            numRRects *= GrRRectEffect::kEdgeTypeCnt;
+            numRRects *= kGrEffectEdgeTypeCnt;
         }
 #endif
 
@@ -111,8 +111,7 @@
 
                         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);