GrFP can express distance vector field req., program builder declares variable for it

src/core/SkNormalMapSource.cpp

Index: src/core/SkNormalMapSource.cpp
diff --git a/src/core/SkNormalMapSource.cpp b/src/core/SkNormalMapSource.cpp
index abb502f3dab5770301d419a6c6dbf700cbe1dd64..336b89941adfab31356a12c7fa88f4f1f8a4367e 100644
--- a/src/core/SkNormalMapSource.cpp
+++ b/src/core/SkNormalMapSource.cpp
@@ -31,13 +31,13 @@ public:
         this->initClassID<NormalMapFP>();
     }
 
-    class GLSLNormalMapFP : public GrGLSLFragmentProcessor {
+    class GLSLNormalMapFP : public GLSLNormalFP {
     public:
         GLSLNormalMapFP()
             : fColumnMajorInvCTM22{0.0f} {}
 
-        void emitCode(EmitArgs& args) override {
-            GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
+        void onEmitCode(EmitArgs& args) override {
+            GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
             GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
 
             // add uniform
@@ -78,7 +78,8 @@ public:
         }
 
     protected:
-        void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override {
+        void setNormalData(const GrGLSLProgramDataManager& pdman,
+                           const GrProcessor& proc) override {
             const NormalMapFP& normalMapFP = proc.cast<NormalMapFP>();
 
             const SkMatrix& invCTM = normalMapFP.invCTM();