Start trying to collapse path program stuff

src/gpu/gl/GrGLPathProgramDataManager.cpp

Index: src/gpu/gl/GrGLPathProgramDataManager.cpp
diff --git a/src/gpu/gl/GrGLPathProgramDataManager.cpp b/src/gpu/gl/GrGLPathProgramDataManager.cpp
index f165015a210cab559daf9a8992845df379ccf75a..567c49c88ce848a45012957d88783d91863f1376 100644
--- a/src/gpu/gl/GrGLPathProgramDataManager.cpp
+++ b/src/gpu/gl/GrGLPathProgramDataManager.cpp
@@ -7,7 +7,6 @@
 
 #include "gl/GrGLPathProgramDataManager.h"
 #include "gl/GrGLPathRendering.h"
-#include "gl/GrGLUniformHandle.h"
 #include "gl/GrGLGpu.h"
 #include "SkMatrix.h"
 
@@ -33,8 +32,7 @@ GrGLPathProgramDataManager::GrGLPathProgramDataManager(
 void GrGLPathProgramDataManager::setPathFragmentInputTransform(SeparableVaryingHandle u,
                                                                int components,
                                                                const SkMatrix& matrix) const {
-    const SeparableVarying& fragmentInput =
-            fSeparableVaryings[u.toProgramDataIndex()];
+    const SeparableVarying& fragmentInput = fSeparableVaryings[u.toIndex()];
 
     SkASSERT((components == 2 && fragmentInput.fType == kVec2f_GrSLType) ||
               (components == 3 && fragmentInput.fType == kVec3f_GrSLType));