Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*.

src/core/SkImageFilter.cpp

 /*
  * Copyright 2012 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 "SkImageFilter.h"
 
 #include "SkBitmap.h"
@@ skipping 186 matching lines @@
     GrContext::AutoRenderTarget art(context, dst.texture()->asRenderTarget());
     GrContext::AutoClip acs(context, dstRect);
     GrEffectRef* effect;
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     bounds.offset(-srcOffset);
     SkMatrix matrix(ctx.ctm());
     matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     this->asNewEffect(&effect, srcTexture, matrix, bounds);
     SkASSERT(effect);
+    SkAutoUnref effectRef(effect);
     GrPaint paint;
-    paint.addColorEffect(effect)->unref();
+    paint.addColorEffect(effect);
     context->drawRectToRect(paint, dstRect, srcRect);
 
     SkAutoTUnref<GrTexture> resultTex(dst.detach());
     WrapTexture(resultTex, bounds.width(), bounds.height(), result);
     return true;
 #else
     return false;
 #endif
 }
 
@@ skipping 72 matching lines @@
             bounds.join(rect);
         }
     }
 
     // don't modify dst until now, so we don't accidentally change it in the
     // loop, but then return false on the next filter.
     *dst = bounds;
     return true;
 }
 
-bool SkImageFilter::asNewEffect(GrEffect**, GrTexture*, const SkMatrix&, const SkIRect&) const {
+bool SkImageFilter::asNewEffect(GrEffectRef**, GrTexture*, const SkMatrix&, const SkIRect&) const {
     return false;
 }
 
 bool SkImageFilter::asColorFilter(SkColorFilter**) const {
     return false;
 }
 
 void SkImageFilter::SetExternalCache(Cache* cache) {
     SkRefCnt_SafeAssign(gExternalCache, cache);
 }
@@ skipping 120 matching lines @@
 
 CacheImpl::~CacheImpl() {
     SkTDynamicHash<Value, Key>::Iter iter(&fData);
 
     while (!iter.done()) {
         Value* v = &*iter;
         ++iter;
         delete v;
     }
 }