commit 83d081ae1d731b5039e99823620f5e287542ee39
author bsalomon <bsalomon@google.com> Tue Jul 08 09:56:10 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 08 09:56:11 2014 -0700
tree 5deeda75fa4584b904a129dc4c1981f002b4cc14
parent ca95c19d27b505a1ac8f57b53cb49c198bc29267

Goodbye GrEffectRef.

Also, reworked some var names and comments around SkShader::asNewEffect.

R=robertphillips@google.com

Author: bsalomon@google.com

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

tests/GLProgramsTest.cpp

diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 8ead5b8..6ee4890 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -166,7 +166,7 @@
         bool useFixedFunctionTexturing = this->shouldUseFixedFunctionTexturing();
 
         for (int s = 0; s < numStages;) {
-            SkAutoTUnref<const GrEffectRef> effect(GrEffectTestFactory::CreateStage(
+            SkAutoTUnref<const GrEffect> effect(GrEffectTestFactory::CreateStage(
                                                                             &random,
                                                                             this->getContext(),
                                                                             *this->caps(),

tests/GpuColorFilterTest.cpp

diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index cdb5ef3..e1850f9 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -98,10 +98,10 @@
     for (size_t i = 0; i < SK_ARRAY_COUNT(filterTests); ++i) {
         const GetConstantComponentTestCase& test = filterTests[i];
         SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode));
-        SkAutoTUnref<GrEffectRef> grEffect(cf->asNewEffect(grContext));
+        SkAutoTUnref<GrEffect> effect(cf->asNewEffect(grContext));
         GrColor color = test.inputColor;
         uint32_t components = test.inputComponents;
-        grEffect->getConstantColorComponents(&color, &components);
+        effect->getConstantColorComponents(&color, &components);
 
         REPORTER_ASSERT(reporter, filterColor(color, components) == test.outputColor);
         REPORTER_ASSERT(reporter, test.outputComponents == components);