Fix copy-paste bugs in SkCanvas Nine and Lattice

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 1968 matching lines @@
                         constraint);
 }
 
 void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
                              const SkPaint* paint) {
     RETURN_ON_NULL(image);
     if (dst.isEmpty()) {
         return;
     }
     if (!SkLatticeIter::Valid(image->width(), image->height(), center)) {
-        this->drawImageRect(image, dst, paint);
+        return this->drawImageRect(image, dst, paint);

[msarett, 2016/08/02 21:47:48]

I think this is a bug?

[reed1, 2016/08/03 13:13:05]

return void is odd. How about

if (Valid) {
    this->onDrawImageNine
} else {
    this->drawImageRect
}

[msarett, 2016/08/03 13:20:52]

Done.

     }
     this->onDrawImageNine(image, center, dst, paint);
 }
 
 void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar dx, SkScalar dy, const SkPaint* paint) {
     if (bitmap.drawsNothing()) {
         return;
     }
     this->onDrawBitmap(bitmap, dx, dy, paint);
 }
@@ skipping 16 matching lines @@
     this->drawBitmapRect(bitmap, SkRect::MakeIWH(bitmap.width(), bitmap.height()), dst, paint,
                          constraint);
 }
 
 void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
                               const SkPaint* paint) {
     if (bitmap.drawsNothing() || dst.isEmpty()) {
         return;
     }
     if (!SkLatticeIter::Valid(bitmap.width(), bitmap.height(), center)) {
-        this->drawBitmapRect(bitmap, dst, paint);
+        return this->drawBitmapRect(bitmap, dst, paint);

[msarett, 2016/08/02 21:47:48]

Ditto

[reed1, 2016/08/03 13:13:05]

ditto

[msarett, 2016/08/03 13:20:52]

Done.

     }
     this->onDrawBitmapNine(bitmap, center, dst, paint);
 }
 
 void SkCanvas::drawBitmapLattice(const SkBitmap& bitmap, const Lattice& lattice, const SkRect& dst,
                                  const SkPaint* paint) {
     sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
     this->drawImageLattice(image.get(), lattice, dst, paint);
 }
 
 void SkCanvas::drawImageLattice(const SkImage* image, const Lattice& lattice, const SkRect& dst,
                                 const SkPaint* paint) {
     RETURN_ON_NULL(image);
     if (dst.isEmpty()) {
         return;
     }
     if (!SkLatticeIter::Valid(image->width(), image->height(), lattice)) {
-        this->drawImageRect(image, dst, paint);
+        return this->drawImageRect(image, dst, paint);

[msarett, 2016/08/02 21:47:48]

Pretty sure this is a bug, since I wrote it...

[msarett, 2016/08/03 13:20:52]

Done.

     }
     this->onDrawImageLattice(image, lattice, dst, paint);
 }
 
 void SkCanvas::drawAtlas(const SkImage* atlas, const SkRSXform xform[], const SkRect tex[],
                          const SkColor colors[], int count, SkXfermode::Mode mode,
                          const SkRect* cull, const SkPaint* paint) {
     RETURN_ON_NULL(atlas);
     if (count <= 0) {
         return;
@@ skipping 1109 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