commit 59f654ab8a711bee2db4440e281b1472531abaa1
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 23 14:03:22 2013 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 23 14:03:22 2013 +0000
tree 50fe33add6756de7d2dff973ec37b2db76ee7a68
parent 03405373421c6b446855d18d5b75e1c2f37686e1

Remove GrContext from SkXfermode::[Aa]sNewEffectOrCoeff() and all subclasses,
since it's unused.

R=bsalomon@google.com

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

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

core/SkXfermode.cpp

diff --git a/core/SkXfermode.cpp b/core/SkXfermode.cpp
index 6cdd97b..75c6529 100644
--- a/core/SkXfermode.cpp
+++ b/core/SkXfermode.cpp
@@ -673,12 +673,11 @@
     return false;
 }
 
-bool SkXfermode::asNewEffectOrCoeff(GrContext*, GrEffectRef**, Coeff* src, Coeff* dst, GrTexture*) const {
+bool SkXfermode::asNewEffectOrCoeff(GrEffectRef**, Coeff* src, Coeff* dst, GrTexture*) const {
     return this->asCoeff(src, dst);
 }
 
 bool SkXfermode::AsNewEffectOrCoeff(SkXfermode* xfermode,
-                                    GrContext* context,
                                     GrEffectRef** effect,
                                     Coeff* src,
                                     Coeff* dst,
@@ -686,7 +685,7 @@
     if (NULL == xfermode) {
         return ModeAsCoeff(kSrcOver_Mode, src, dst);
     } else {
-        return xfermode->asNewEffectOrCoeff(context, effect, src, dst, background);
+        return xfermode->asNewEffectOrCoeff(effect, src, dst, background);
     }
 }
 
@@ -1364,8 +1363,7 @@
 }
 
 #if SK_SUPPORT_GPU
-bool SkProcCoeffXfermode::asNewEffectOrCoeff(GrContext*,
-                                             GrEffectRef** effect,
+bool SkProcCoeffXfermode::asNewEffectOrCoeff(GrEffectRef** effect,
                                              Coeff* src,
                                              Coeff* dst,
                                              GrTexture* background) const {

core/SkXfermode_proccoeff.h

diff --git a/core/SkXfermode_proccoeff.h b/core/SkXfermode_proccoeff.h
index 23a83f2..bba8b39 100644
--- a/core/SkXfermode_proccoeff.h
+++ b/core/SkXfermode_proccoeff.h
@@ -29,8 +29,7 @@
     virtual bool asCoeff(Coeff* sc, Coeff* dc) const SK_OVERRIDE;
 
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffectOrCoeff(GrContext*,
-                                    GrEffectRef** effect,
+    virtual bool asNewEffectOrCoeff(GrEffectRef** effect,
                                     Coeff* src,
                                     Coeff* dst,
                                     GrTexture* background) const SK_OVERRIDE;

effects/SkArithmeticMode.cpp

diff --git a/effects/SkArithmeticMode.cpp b/effects/SkArithmeticMode.cpp
index fff03c2..7c4428c 100644
--- a/effects/SkArithmeticMode.cpp
+++ b/effects/SkArithmeticMode.cpp
@@ -36,7 +36,7 @@
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArithmeticMode_scalar)
 
 #if SK_SUPPORT_GPU
-    virtual bool asNewEffectOrCoeff(GrContext*, GrEffectRef** effect, Coeff*, Coeff*, GrTexture* background) const SK_OVERRIDE;
+    virtual bool asNewEffectOrCoeff(GrEffectRef** effect, Coeff*, Coeff*, GrTexture* background) const SK_OVERRIDE;
 #endif
 
 private:
@@ -408,8 +408,7 @@
 
 GR_DEFINE_EFFECT_TEST(GrArithmeticEffect);
 
-bool SkArithmeticMode_scalar::asNewEffectOrCoeff(GrContext*,
-                                                 GrEffectRef** effect,
+bool SkArithmeticMode_scalar::asNewEffectOrCoeff(GrEffectRef** effect,
                                                  Coeff*,
                                                  Coeff*,
                                                  GrTexture* background) const {

effects/SkXfermodeImageFilter.cpp

diff --git a/effects/SkXfermodeImageFilter.cpp b/effects/SkXfermodeImageFilter.cpp
index 4d30f00..e8fa0d2 100644
--- a/effects/SkXfermodeImageFilter.cpp
+++ b/effects/SkXfermodeImageFilter.cpp
@@ -123,7 +123,7 @@
     GrContext::AutoRenderTarget art(context, dst->asRenderTarget());
 
     SkXfermode::Coeff sm, dm;
-    if (!SkXfermode::AsNewEffectOrCoeff(fMode, context, &xferEffect, &sm, &dm, backgroundTex)) {
+    if (!SkXfermode::AsNewEffectOrCoeff(fMode, &xferEffect, &sm, &dm, backgroundTex)) {
         return false;
     }
 

gpu/SkGpuDevice.cpp

diff --git a/gpu/SkGpuDevice.cpp b/gpu/SkGpuDevice.cpp
index a70a0f5..47ddd52 100644
--- a/gpu/SkGpuDevice.cpp
+++ b/gpu/SkGpuDevice.cpp
@@ -436,7 +436,7 @@
 
     SkXfermode* mode = skPaint.getXfermode();
     GrEffectRef* xferEffect = NULL;
-    if (SkXfermode::AsNewEffectOrCoeff(mode, dev->context(), &xferEffect, &sm, &dm)) {
+    if (SkXfermode::AsNewEffectOrCoeff(mode, &xferEffect, &sm, &dm)) {
         if (NULL != xferEffect) {
             grPaint->addColorEffect(xferEffect)->unref();
             sm = SkXfermode::kOne_Coeff;