Make use of new SkLights class

gm/lightingshader.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkLightingShader.h"
@@ skipping 28 matching lines @@
 }
 
 namespace skiagm {
 
 // This GM exercises lighting shaders.
 class LightingShaderGM : public GM {
 public:
     LightingShaderGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
 
-        SkLightingShader::Lights::Builder builder;
+        SkLights::Builder builder;
 
-        builder.add(SkLight(SkColor3f::Make(1.0f, 1.0f, 1.0f),
-                            SkVector3::Make(1.0f, 0.0f, 0.0f)));
-        builder.add(SkLight(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
+        builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f),
+                                    SkVector3::Make(1.0f, 0.0f, 0.0f)));
+        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
 
-        fLights.reset(builder.finish());
+        fLights = builder.finish();
     }
 
 protected:
     enum NormalMap {
         kHemi_NormalMap,
         kFrustum_NormalMap,
         kTetra_NormalMap,
 
         kLast_NormalMap = kTetra_NormalMap
     };
@@ skipping 89 matching lines @@
             canvas->setMatrix(m);
             this->drawRect(canvas, r, kHemi_NormalMap);
             canvas->restore();
         }
     }
 
 private:
     static const int kTexSize = 128;
     static const int kGMSize  = 512;
 
-    SkBitmap                fDiffuse;
-    SkBitmap                fNormalMaps[kNormalMapCount];
+    SkBitmap        fDiffuse;
+    SkBitmap        fNormalMaps[kNormalMapCount];
 
-    SkAutoTUnref<const SkLightingShader::Lights>  fLights;
+    sk_sp<SkLights> fLights;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LightingShaderGM;)
 }