Revert of Moved ambient lights out of SkLight's light array

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
@@ skipping 3213 matching lines @@
 
     sk_sp<SkImage> povDepthMap;
     sk_sp<SkImage> diffuseMap;
 
     // TODO: pass the depth to the shader in vertices, or uniforms
     //       so we don't have to render depth and color separately
     for (int i = 0; i < fLights->numLights(); ++i) {
         // skip over ambient lights; they don't cast shadows
         // lights that have shadow maps do not need updating (because lights are immutable)
 
-        if (fLights->light(i).getShadowMap() != nullptr) {
+        if (SkLights::Light::kAmbient_LightType == fLights->light(i).type() ||
+            fLights->light(i).getShadowMap() != nullptr) {
             continue;
         }
 
         // TODO: compute the correct size of the depth map from the light properties
         // TODO: maybe add a kDepth_8_SkColorType
         // TODO: find actual max depth of picture
         SkISize shMapSize = SkShadowPaintFilterCanvas::ComputeDepthMapSize(
                                     fLights->light(i), 255,
                                     picture->cullRect().width(),
                                     picture->cullRect().height());
@@ skipping 201 matching lines @@
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }
 
 #ifdef SK_SUPPORT_LEGACY_NEW_SURFACE_API
 SkSurface* SkCanvas::newSurface(const SkImageInfo& info, const SkSurfaceProps* props) {
     return this->makeSurface(info, props).release();
 }
 #endif