diff options
author | 2015-05-04 09:00:45 -0700 | |
---|---|---|
committer | 2015-05-04 09:00:46 -0700 | |
commit | 973d1f1f60f2710a268a3165aa4f3460502d4be5 (patch) | |
tree | f286182cba71c1f2a723898cc2f8d2e74035bd5b /src/core | |
parent | 71a6cbfc585959738dc0b375603696ca7f60605f (diff) |
Revert of make drawImage a virtual on SkDevice (patchset #3 id:40001 of https://codereview.chromium.org/1118823004/)
Reason for revert:
need to make serialization work for pictures, now that images are "real"
Original issue's description:
> make drawImage a virtual on SkDevice
>
> default impl will turn the Image into a (raster) bitmap and call drawBitmap.
>
> BUG=skia:3803
>
> Committed: https://skia.googlesource.com/skia/+/f603fb3d0e5fa57c3f228d66945bef198b001135
TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3803
Review URL: https://codereview.chromium.org/1122803002
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkCanvas.cpp | 56 | ||||
-rw-r--r-- | src/core/SkDevice.cpp | 20 |
2 files changed, 5 insertions, 71 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 34d6aaa0ab..3e3f714880 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1734,15 +1734,12 @@ void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) { this->onDrawPath(path, paint); } -void SkCanvas::drawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) { - this->onDrawImage(image, x, y, paint); +void SkCanvas::drawImage(const SkImage* image, SkScalar dx, SkScalar dy, const SkPaint* paint) { + this->onDrawImage(image, dx, dy, paint); } void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, const SkPaint* paint) { - if (dst.isEmpty()) { - return; - } this->onDrawImageRect(image, src, dst, paint); } @@ -1962,58 +1959,15 @@ void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) { LOOPER_END } -void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) { +void SkCanvas::onDrawImage(const SkImage* image, SkScalar dx, SkScalar dy, const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImage()"); - SkRect bounds = SkRect::MakeXYWH(x, y, - SkIntToScalar(image->width()), SkIntToScalar(image->height())); - if (NULL == paint || paint->canComputeFastBounds()) { - if (paint) { - paint->computeFastBounds(bounds, &bounds); - } - if (this->quickReject(bounds)) { - return; - } - } - - SkLazyPaint lazy; - if (NULL == paint) { - paint = lazy.init(); - } - - LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, &bounds) - - while (iter.next()) { - iter.fDevice->drawImage(iter, image, x, y, looper.paint()); - } - - LOOPER_END + image->draw(this, dx, dy, paint); } void SkCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, const SkPaint* paint) { TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImageRect()"); - SkRect storage; - const SkRect* bounds = &dst; - if (NULL == paint || paint->canComputeFastBounds()) { - if (paint) { - bounds = &paint->computeFastBounds(dst, &storage); - } - if (this->quickReject(*bounds)) { - return; - } - } - SkLazyPaint lazy; - if (NULL == paint) { - paint = lazy.init(); - } - - LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds) - - while (iter.next()) { - iter.fDevice->drawImageRect(iter, image, src, dst, looper.paint()); - } - - LOOPER_END + image->drawRect(this, src, dst, paint); } void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, const SkPaint* paint) { diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index 9a43fd0e32..6be9178f23 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -165,26 +165,6 @@ void SkBaseDevice::drawTextBlob(const SkDraw& draw, const SkTextBlob* blob, SkSc } } -#include "SkImage_Base.h" - -void SkBaseDevice::drawImage(const SkDraw& draw, const SkImage* image, SkScalar x, SkScalar y, - const SkPaint& paint) { - // Default impl : turns everything into raster bitmap - SkBitmap bm; - if (as_IB(image)->getROPixels(&bm)) { - this->drawBitmap(draw, bm, SkMatrix::MakeTrans(x, y), paint); - } -} - -void SkBaseDevice::drawImageRect(const SkDraw& draw, const SkImage* image, const SkRect* src, - const SkRect& dst, const SkPaint& paint) { - // Default impl : turns everything into raster bitmap - SkBitmap bm; - if (as_IB(image)->getROPixels(&bm)) { - this->drawBitmapRect(draw, bm, src, dst, paint, SkCanvas::DrawBitmapRectFlags(0)); - } -} - bool SkBaseDevice::readPixels(const SkImageInfo& info, void* dstP, size_t rowBytes, int x, int y) { #ifdef SK_DEBUG SkASSERT(info.width() > 0 && info.height() > 0); |