Start trying to collapse path program stuff

src/gpu/gl/builders/GrGLPathProgramBuilder.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLPathProgramBuilder.h"
 #include "gl/GrGLGpu.h"
 #include "gl/GrGLPathProgram.h"
@@ skipping 11 matching lines @@
                                fSeparableVaryingInfos, fGeometryProcessor, fXferProcessor,
                                fFragmentProcessors.get(), &fSamplerUniforms);
 }
 
 GrGLProgramBuilder::SeparableVaryingHandle GrGLPathProgramBuilder::addSeparableVarying(
     const char* name, GrGLVertToFrag* v, GrSLPrecision fsPrecision) {
     this->addVarying(name, v, fsPrecision);
     SeparableVaryingInfo& varyingInfo = fSeparableVaryingInfos.push_back();
     varyingInfo.fVariable = this->getFragmentShaderBuilder()->fInputs.back();
     varyingInfo.fLocation = fSeparableVaryingInfos.count() - 1;
-    return SeparableVaryingHandle::CreateFromSeparableVaryingIndex(varyingInfo.fLocation);
+    return SeparableVaryingHandle(varyingInfo.fLocation);
 }
 
 void GrGLPathProgramBuilder::bindProgramResourceLocations(GrGLuint programID) {
     this->INHERITED::bindProgramResourceLocations(programID);
     if (!fGpu->glPathRendering()->shouldBindFragmentInputs()) {
         return;
     }
     int count = fSeparableVaryingInfos.count();
     for (int i = 0; i < count; ++i) {
         GL_CALL(BindFragmentInputLocation(programID,
@@ skipping 11 matching lines @@
     int count = fSeparableVaryingInfos.count();
     for (int i = 0; i < count; ++i) {
         GrGLint location;
         GL_CALL_RET(location,
                     GetProgramResourceLocation(programID,
                                                GR_GL_FRAGMENT_INPUT,
                                                fSeparableVaryingInfos[i].fVariable.c_str()));
         fSeparableVaryingInfos[i].fLocation = location;
     }
 }