Refugee from Dead Machine 11: Add SkCanvas::drawLitAtlas call

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 1914 matching lines @@
                          const SkRect* cull, const SkPaint* paint) {
     if (count <= 0) {
         return;
     }
     SkASSERT(atlas);
     SkASSERT(xform);
     SkASSERT(tex);
     this->onDrawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
 }
 
+void SkCanvas::drawLitAtlas(const SkImage* atlas, const SkRSXform xforms[],
+                            const SkRect diffTex[], const SkRect normTex[],
+                            const SkColor colors[], int count, SkXfermode::Mode mode,
+                            const SkRect* cull, const SkPaint* paint,
+                            const SkLight lights[], int numLights) {
+    if (count <= 0) {
+        return;
+    }
+    SkASSERT(atlas);
+    SkASSERT(xforms);
+    SkASSERT(diffTex);
+    SkASSERT(normTex);
+    this->onDrawLitAtlas(atlas, xforms, diffTex, normTex, colors, count, mode, cull,
+                         paint, lights, numLights);
+}
+
 void SkCanvas::legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
                                     const SkPaint* paint, SrcRectConstraint constraint) {
     if (src) {
         this->drawImageRect(image, *src, dst, paint, constraint);
     } else {
         this->drawImageRect(image, SkRect::MakeIWH(image->width(), image->height()),
                             dst, paint, constraint);
     }
 }
 void SkCanvas::legacy_drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
@@ skipping 669 matching lines @@
         pnt = *paint;
     }
     
     LOOPER_BEGIN(pnt, SkDrawFilter::kPath_Type, NULL)
     while (iter.next()) {
         iter.fDevice->drawAtlas(iter, atlas, xform, tex, colors, count, mode, pnt);
     }
     LOOPER_END
 }
 
+void SkCanvas::onDrawLitAtlas(const SkImage* atlas, const SkRSXform xform[],
+                              const SkRect diffTex[], const SkRect normTex[],
+                              const SkColor colors[], int count, SkXfermode::Mode mode,
+                              const SkRect* cull, const SkPaint* paint,
+                              const SkLight lights[], int numLights) {
+    if (cull && this->quickReject(*cull)) {
+        return;
+    }
+
+    SkPaint pnt;
+    if (paint) {
+        pnt = *paint;
+    }
+    
+    LOOPER_BEGIN(pnt, SkDrawFilter::kPath_Type, NULL)
+    while (iter.next()) {
+        iter.fDevice->drawLitAtlas(iter, atlas, xform, diffTex, normTex, colors, count, mode, pnt,
+                                   lights, numLights);
+    }
+    LOOPER_END
+}
+
 //////////////////////////////////////////////////////////////////////////////
 // These methods are NOT virtual, and therefore must call back into virtual
 // methods, rather than actually drawing themselves.
 //////////////////////////////////////////////////////////////////////////////
 
 void SkCanvas::drawARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b,
                         SkXfermode::Mode mode) {
     TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawARGB()");
     SkPaint paint;
 
@@ skipping 250 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }