removing GrDrawEffect

src/effects/gradients/SkGradientShader.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGradientShaderPriv.h"
 #include "SkLinearGradient.h"
 #include "SkRadialGradient.h"
@@ skipping 983 matching lines @@
        float a = SkColorGetA(*color) / 255.f;
        float aDiv255 = a / 255.f;
        pdman.set4f(uni,
                    SkColorGetR(*color) * aDiv255,
                    SkColorGetG(*color) * aDiv255,
                    SkColorGetB(*color) * aDiv255,
                    a);
 }
 
 void GrGLGradientEffect::setData(const GrGLProgramDataManager& pdman,
-                                 const GrDrawEffect& drawEffect) {
+                                 const GrEffect& effect) {
 
-    const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
+    const GrGradientEffect& e = effect.cast<GrGradientEffect>();
 
 
     if (SkGradientShaderBase::kTwo_GpuColorType == e.getColorType()){
 
         if (GrGradientEffect::kBeforeInterp_PremulType == e.getPremulType()) {
             set_mul_color_uni(pdman, fColorStartUni, e.getColors(0));
             set_mul_color_uni(pdman, fColorEndUni,   e.getColors(1));
         } else {
             set_color_uni(pdman, fColorStartUni, e.getColors(0));
             set_color_uni(pdman, fColorEndUni,   e.getColors(1));
@@ skipping 14 matching lines @@
 
         SkScalar yCoord = e.getYCoord();
         if (yCoord != fCachedYCoord) {
             pdman.set1f(fFSYUni, yCoord);
             fCachedYCoord = yCoord;
         }
     }
 }
 
 
-uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrDrawEffect& drawEffect) {
-    const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
+uint32_t GrGLGradientEffect::GenBaseGradientKey(const GrEffect& effect) {
+    const GrGradientEffect& e = effect.cast<GrGradientEffect>();
 
     uint32_t key = 0;
 
     if (SkGradientShaderBase::kTwo_GpuColorType == e.getColorType()) {
         key |= kTwoColorKey;
     } else if (SkGradientShaderBase::kThree_GpuColorType == e.getColorType()){
         key |= kThreeColorKey;
     }
 
     if (GrGradientEffect::kBeforeInterp_PremulType == e.getPremulType()) {
@@ skipping 126 matching lines @@
     this->addCoordTransform(&fCoordTransform);
 }
 
 GrGradientEffect::~GrGradientEffect() {
     if (this->useAtlas()) {
         fAtlas->unlockRow(fRow);
     }
 }
 
 bool GrGradientEffect::onIsEqual(const GrEffect& effect) const {
-    const GrGradientEffect& s = CastEffect<GrGradientEffect>(effect);
+    const GrGradientEffect& s = effect.cast<GrGradientEffect>();
 
     if (this->fColorType == s.getColorType()){
 
         if (SkGradientShaderBase::kTwo_GpuColorType == fColorType) {
             if (*this->getColors(0) != *s.getColors(0) ||
                 *this->getColors(1) != *s.getColors(1)) {
                 return false;
             }
         } else if (SkGradientShaderBase::kThree_GpuColorType == fColorType) {
             if (*this->getColors(0) != *s.getColors(0) ||
@@ skipping 43 matching lines @@
             (*stops)[i] = stop;
             stop = i < outColors - 1 ? stop + random->nextUScalar1() * (1.f - stop) : 1.f;
         }
     }
     *tm = static_cast<SkShader::TileMode>(random->nextULessThan(SkShader::kTileModeCount));
 
     return outColors;
 }
 
 #endif