| Index: src/core/SkDevice.cpp
|
| diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
|
| index 59408dc64abe0074b36842ff106632985285441d..74e86dc9f07057222ca5432918998f9a6f7f5d80 100644
|
| --- a/src/core/SkDevice.cpp
|
| +++ b/src/core/SkDevice.cpp
|
| @@ -12,6 +12,7 @@
|
| #include "SkImage_Base.h"
|
| #include "SkImageFilter.h"
|
| #include "SkImageFilterCache.h"
|
| +#include "SkImagePriv.h"
|
| #include "SkLatticeIter.h"
|
| #include "SkMetaData.h"
|
| #include "SkPatchUtils.h"
|
| @@ -152,17 +153,6 @@ void SkBaseDevice::drawImage(const SkDraw& draw, const SkImage* image, SkScalar
|
| }
|
| }
|
|
|
| -void SkBaseDevice::drawImageLattice(const SkDraw& draw, const SkImage* image,
|
| - const SkCanvas::Lattice& lattice, const SkRect& dst,
|
| - const SkPaint& paint) {
|
| - SkLatticeIter iter(image->width(), image->height(), lattice, dst);
|
| -
|
| - SkRect srcR, dstR;
|
| - while (iter.next(&srcR, &dstR)) {
|
| - this->drawImageRect(draw, image, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);
|
| - }
|
| -}
|
| -
|
| void SkBaseDevice::drawImageRect(const SkDraw& draw, const SkImage* image, const SkRect* src,
|
| const SkRect& dst, const SkPaint& paint,
|
| SkCanvas::SrcRectConstraint constraint) {
|
| @@ -193,6 +183,28 @@ void SkBaseDevice::drawBitmapNine(const SkDraw& draw, const SkBitmap& bitmap, co
|
| }
|
| }
|
|
|
| +void SkBaseDevice::drawImageLattice(const SkDraw& draw, const SkImage* image,
|
| + const SkCanvas::Lattice& lattice, const SkRect& dst,
|
| + const SkPaint& paint) {
|
| + SkLatticeIter iter(image->width(), image->height(), lattice, dst);
|
| +
|
| + SkRect srcR, dstR;
|
| + while (iter.next(&srcR, &dstR)) {
|
| + this->drawImageRect(draw, image, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);
|
| + }
|
| +}
|
| +
|
| +void SkBaseDevice::drawBitmapLattice(const SkDraw& draw, const SkBitmap& bitmap,
|
| + const SkCanvas::Lattice& lattice, const SkRect& dst,
|
| + const SkPaint& paint) {
|
| + SkLatticeIter iter(bitmap.width(), bitmap.height(), lattice, dst);
|
| +
|
| + SkRect srcR, dstR;
|
| + while (iter.next(&srcR, &dstR)) {
|
| + this->drawBitmapRect(draw, bitmap, &srcR, dstR, paint, SkCanvas::kStrict_SrcRectConstraint);
|
| + }
|
| +}
|
| +
|
| void SkBaseDevice::drawAtlas(const SkDraw& draw, const SkImage* atlas, const SkRSXform xform[],
|
| const SkRect tex[], const SkColor colors[], int count,
|
| SkXfermode::Mode mode, const SkPaint& paint) {
|
|
|