Creating framework for drawShadowedPicture

include/core/SkLights.h

Index: include/core/SkLights.h
diff --git a/include/core/SkLights.h b/include/core/SkLights.h
index c5c54276a39597909ff53a0465a6e97fee5a8743..c2d8309dc16ab8f694e14be79944323719cf501f 100644
--- a/include/core/SkLights.h
+++ b/include/core/SkLights.h
@@ -12,6 +12,7 @@
 #include "SkPoint3.h"
 #include "SkRefCnt.h"
 #include "../private/SkTDArray.h"
+#include "SkImage.h"
 
 class SK_API SkLights  : public SkRefCnt {
 public:
@@ -24,14 +25,16 @@ public:
 
         Light(const SkColor3f& color)
             : fType(kAmbient_LightType)
-            , fColor(color) {
+            , fColor(color)
+            , fShadowMap(nullptr) {
             fDirection.set(0.0f, 0.0f, 1.0f);
         }
 
         Light(const SkColor3f& color, const SkVector3& dir)
             : fType(kDirectional_LightType)
             , fColor(color)
-            , fDirection(dir) {
+            , fDirection(dir)
+            , fShadowMap(nullptr) {
             if (!fDirection.normalize()) {
                 fDirection.set(0.0f, 0.0f, 1.0f);
             }
@@ -44,11 +47,16 @@ public:
             return fDirection; 
         }
 
+        void setShadowMap(sk_sp<SkImage> shadowMap) {
+            fShadowMap = shadowMap.get();
+        }
+
     private:
         LightType   fType;
         SkColor3f   fColor;           // linear (unpremul) color. Range is 0..1 in each channel.
         SkVector3   fDirection;       // direction towards the light (+Z is out of the screen).
                                       // If degenerate, it will be replaced with (0, 0, 1).
+        SkImage* fShadowMap; // if we use an sk_sp, this freaking breaks because it's init to nullptr

[jvanverth1, 2016/07/18 17:32:08]

The default constructor for sk_sp should initialize to nullptr, so you should be
able to declare this as sk_sp<SkImage> and not include it in the constructor for
Light.  If you're worried, you can use fShadowMap.reset(nullptr) in the body of
the constructor. 

That said, your comment should line up with the other ones, and the whole line
shouldn't exceed 100 characters. And 'freaking' isn't really appropriate here.

[vjiaoblack, 2016/07/18 17:56:21]

Fixed the segfault, so I removed the comment entirely!

     };
 
     class Builder {
@@ -77,6 +85,10 @@ public:
         return fLights[index];
     }
 
+    Light& light(int index) {
+        return fLights[index];
+    }
+
 private:
     SkLights() {}