| Index: src/core/SkCanvas.cpp
|
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
|
| index 6a11db5ee5a2147972004926763af752cf249c7c..258343a92f6644909b65cb605fb7a13a6f0673e8 100644
|
| --- a/src/core/SkCanvas.cpp
|
| +++ b/src/core/SkCanvas.cpp
|
| @@ -2235,7 +2235,7 @@ void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const S
|
| return;
|
| }
|
| }
|
| -
|
| +
|
| SkLazyPaint lazy;
|
| if (nullptr == paint) {
|
| paint = lazy.init();
|
| @@ -2272,7 +2272,7 @@ void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const S
|
| iter.fDevice->drawImage(iter, image, x, y, pnt);
|
| }
|
| }
|
| -
|
| +
|
| LOOPER_END
|
| }
|
|
|
| @@ -2292,14 +2292,14 @@ void SkCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const Sk
|
| if (nullptr == paint) {
|
| paint = lazy.init();
|
| }
|
| -
|
| +
|
| LOOPER_BEGIN_CHECK_COMPLETE_OVERWRITE(*paint, SkDrawFilter::kBitmap_Type, &dst,
|
| image->isOpaque())
|
| -
|
| +
|
| while (iter.next()) {
|
| iter.fDevice->drawImageRect(iter, image, src, dst, looper.paint(), constraint);
|
| }
|
| -
|
| +
|
| LOOPER_END
|
| }
|
|
|
| @@ -2397,25 +2397,25 @@ void SkCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const
|
| void SkCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
|
| const SkPaint* paint) {
|
| TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageNine()");
|
| -
|
| +
|
| if (nullptr == paint || paint->canComputeFastBounds()) {
|
| SkRect storage;
|
| if (this->quickReject(paint ? paint->computeFastBounds(dst, &storage) : dst)) {
|
| return;
|
| }
|
| }
|
| -
|
| +
|
| SkLazyPaint lazy;
|
| if (nullptr == paint) {
|
| paint = lazy.init();
|
| }
|
| -
|
| +
|
| LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, &dst)
|
| -
|
| +
|
| while (iter.next()) {
|
| iter.fDevice->drawImageNine(iter, image, center, dst, looper.paint());
|
| }
|
| -
|
| +
|
| LOOPER_END
|
| }
|
|
|
| @@ -2430,18 +2430,18 @@ void SkCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, c
|
| return;
|
| }
|
| }
|
| -
|
| +
|
| SkLazyPaint lazy;
|
| if (nullptr == paint) {
|
| paint = lazy.init();
|
| }
|
| -
|
| +
|
| LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, &dst)
|
| -
|
| +
|
| while (iter.next()) {
|
| iter.fDevice->drawBitmapNine(iter, bitmap, center, dst, looper.paint());
|
| }
|
| -
|
| +
|
| LOOPER_END
|
| }
|
|
|
| @@ -2740,7 +2740,7 @@ void SkCanvas::onDrawAtlas(const SkImage* atlas, const SkRSXform xform[], const
|
| if (paint) {
|
| pnt = *paint;
|
| }
|
| -
|
| +
|
| LOOPER_BEGIN(pnt, SkDrawFilter::kPath_Type, nullptr)
|
| while (iter.next()) {
|
| iter.fDevice->drawAtlas(iter, atlas, xform, tex, colors, count, mode, pnt);
|
|
|