commit 7ab7ca4199e97126de01d507d34f60a07843937f
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 28 15:59:13 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 28 15:59:13 2013 +0000
tree 67af0f806d43af464b5e3b6b0dcfacc75e1d4cda
parent 1c028bd395dc52ca12b99f85f0c297d15a288c2d

Fix case where GrGLEffectMatrix gives back a dangling ptr for the coords var name.

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/23706003

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

src/effects/gradients/SkTwoPointConicalGradient.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index ee6e25a..6926c2d 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -490,8 +490,8 @@
                                     const char* outputColor,
                                     const char* inputColor,
                                     const TextureSamplerArray& samplers) {
-    const char* fsCoords;
-    const char* vsCoordsVarying;
+    SkString fsCoords;
+    SkString vsCoordsVarying;
     GrSLType coordsVaryingType;
     this->setupMatrix(builder, key, &fsCoords, &vsCoordsVarying, &coordsVaryingType);
 
@@ -526,7 +526,7 @@
             // r2Var = -2 * (r2Parm[2] * varCoord.x - r2Param[3] * r2Param[5])
             builder->vsCodeAppendf("\t%s = -2.0 * (%s * %s.x + %s * %s);\n",
                                    fVSVaryingName, p2.c_str(),
-                                   vsCoordsVarying, p3.c_str(), p5.c_str());
+                                   vsCoordsVarying.c_str(), p3.c_str(), p5.c_str());
         }
     }
 
@@ -562,7 +562,7 @@
         } else {
             bVar = "b";
             builder->fsCodeAppendf("\tfloat %s = -2.0 * (%s * %s.x + %s * %s);\n",
-                                   bVar.c_str(), p2.c_str(), fsCoords,
+                                   bVar.c_str(), p2.c_str(), fsCoords.c_str(),
                                    p3.c_str(), p5.c_str());
         }
 
@@ -572,7 +572,7 @@
 
         // c = (x^2)+(y^2) - params[4]
         builder->fsCodeAppendf("\tfloat %s = dot(%s, %s) - %s;\n", cName.c_str(),
-                               fsCoords, fsCoords,
+                               fsCoords.c_str(), fsCoords.c_str(),
                                p4.c_str());
 
         // Non-degenerate case (quadratic)