Refactoring of GPU NormalMap handling out into its own class

src/core/SkLightingShader.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLightingShader_DEFINED
 #define SkLightingShader_DEFINED
 
 #include "SkLights.h"
 #include "SkShader.h"
 
 class SkBitmap;
 class SkMatrix;
 
 class SK_API SkLightingShader {
 public:
+    class NormalSource : public SkFlattenable {
+    public:
+        virtual ~NormalSource();
+
+#if SK_SUPPORT_GPU
+        virtual sk_sp<GrFragmentProcessor> asFragmentProcessor(

[reed1, 2016/06/10 19:15:23]

use override instead

[dvonbeck, 2016/06/10 21:00:16]

This is not overriding anything, it's the NormalSource base class, which doesn't
inherit from SkShader.

+                GrContext* context,
+                const SkMatrix& viewM,
+                const SkMatrix* localMatrix,
+                SkFilterQuality filterQuality,
+                SkSourceGammaTreatment gammaTreatment) const = 0;
+#endif
+
+        SK_DEFINE_FLATTENABLE_TYPE(NormalSource)

[dvonbeck, 2016/06/10 18:31:21]

FLATTENABLE: Macro

+    };
+
+    class SK_API NormalMapSource {
+    public:
+        static sk_sp<NormalSource> Make(const SkBitmap& normal, const SkVector& invNormRotation,
+                                        const SkMatrix* normLocalM);
+
+        SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()

[dvonbeck, 2016/06/10 18:31:21]

FLATTENABLE: Macro

+    };
+
     /** Returns a shader that lights the diffuse and normal maps with a set of lights.
 
         It returns a shader with a reference count of 1.
         The caller should decrement the shader's reference count when done with the shader.
         It is an error for count to be < 2.
         @param  diffuse     the diffuse bitmap
         @param  normal      the normal map
         @param  lights       the lights applied to the normal map
         @param  invNormRotation rotation applied to the normal map's normals
         @param  diffLocalMatrix the local matrix for the diffuse texture
@@ skipping 17 matching lines @@
         (127, 127, 0).
     */
     static sk_sp<SkShader> Make(const SkBitmap& diffuse, const SkBitmap& normal,
                                 sk_sp<SkLights> lights, const SkVector& invNormRotation,
                                 const SkMatrix* diffLocalMatrix, const SkMatrix* normLocalMatrix);
 
     SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
 };
 
 #endif