| Index: src/gpu/gl/builders/GrGLVertexShaderBuilder.h | 
| diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.h b/src/gpu/gl/builders/GrGLVertexShaderBuilder.h | 
| index 7d6d95e5080c0fe0e8f5018ec57258158f2d9eec..2f14bd77022e7aa0bd66a4099e951a743d3d56ca 100644 | 
| --- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.h | 
| +++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.h | 
| @@ -31,15 +31,6 @@ | 
| */ | 
| const GrGLShaderVar& positionAttribute() const { return *fPositionVar; } | 
|  | 
| -    /** returns the expected position output */ | 
| -    const char* glPosition() const { return "pos3"; } | 
| - | 
| -    /** returns the expected uviewM matrix */ | 
| -    // TODO all of this fixed function stuff can live on the GP/PP | 
| -    const char* uViewM() const { return "uViewM"; } | 
| -    const char* inPosition() const { return "inPosition"; } | 
| - | 
| - | 
| private: | 
| /* | 
| * Internal call for GrGLProgramBuilder.addVarying | 
| @@ -49,13 +40,12 @@ | 
| /* | 
| * private helpers for compilation by GrGLProgramBuilder | 
| */ | 
| -    void transformToNormalizedDeviceSpace(); | 
| -    //TODO GP itself should setup the uniform view matrix | 
| -    void setupUniformViewMatrix(); | 
| -    void setupPositionAndLocalCoords(); | 
| +    void setupLocalCoords(); | 
| +    void transformGLToSkiaCoords(); | 
| void setupBuiltinVertexAttribute(const char* inName, GrGLSLExpr1* out); | 
| void setupBuiltinVertexAttribute(const char* inName, GrGLSLExpr4* out); | 
| void emitAttributes(const GrGeometryProcessor& gp); | 
| +    void transformSkiaToGLCoords(); | 
| void bindVertexAttributes(GrGLuint programID); | 
| bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const; | 
|  | 
| @@ -71,7 +61,6 @@ | 
|  | 
| GrGLShaderVar*                      fPositionVar; | 
| GrGLShaderVar*                      fLocalCoordsVar; | 
| -    const char*                         fRtAdjustName; | 
| int                                 fEffectAttribOffset; | 
|  | 
| friend class GrGLProgramBuilder; | 
|  |