Start trying to collapse path program stuff

src/gpu/gl/GrGLPathProcessor.cpp

Index: src/gpu/gl/GrGLPathProcessor.cpp
diff --git a/src/gpu/gl/GrGLPathProcessor.cpp b/src/gpu/gl/GrGLPathProcessor.cpp
index a9710281640eb934cb247194dcfd8458ee2eb357..00283ac50e488750934f5a917962fefe0066dc38 100644
--- a/src/gpu/gl/GrGLPathProcessor.cpp
+++ b/src/gpu/gl/GrGLPathProcessor.cpp
@@ -73,7 +73,7 @@ void GrGLPathProcessor::emitTransforms(GrGLGPBuilder* pb, const TransformsIn& ti
             strVaryingName.appendf("_%i_%i", i, t);
             GrGLVertToFrag v(varyingType);
             fInstalledTransforms[i][t].fHandle =
-                    pb->addSeparableVarying(strVaryingName.c_str(), &v).toShaderBuilderIndex();
+                    pb->addSeparableVarying(strVaryingName.c_str(), &v).toIndex();
             fInstalledTransforms[i][t].fType = varyingType;
 
             SkNEW_APPEND_TO_TARRAY(&(*tout)[i], GrGLProcessor::TransformedCoords,
@@ -102,6 +102,6 @@ void GrGLPathProcessor::setTransformData(
         SkASSERT(transforms[t].fType == kVec2f_GrSLType ||
                  transforms[t].fType == kVec3f_GrSLType);
         unsigned components = transforms[t].fType == kVec2f_GrSLType ? 2 : 3;
-        pdman.setPathFragmentInputTransform(transforms[t].fHandle.handle(), components, transform);
+        pdman.setPathFragmentInputTransform(transforms[t].fHandle, components, transform);
     }
 }