diff options
| author |  reed <reed@google.com> | 2015-07-28 07:35:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-28 07:35:14 -0700 |
| commit | 562fe4767cc73e08a4e039362bc0336aea66ecfb (patch) | |
| tree | 02244ec3279fa16de377f53a7dddce993971048a /src/gpu | |
| parent | 91f283bb4e6ea71bbd4e6efc27befc29118ee543 (diff) | |
remove all guards for changes to drawBitmapRect / drawImageRect
BUG=skia:
Review URL: https://codereview.chromium.org/1239193002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 7 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index e66d28f0da..867c2edac8 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1381,10 +1381,7 @@ void SkGpuDevice::drawSprite(const SkDraw& draw, const SkBitmap& bitmap, void SkGpuDevice::drawBitmapRect(const SkDraw& origDraw, const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint& paint, - SK_VIRTUAL_CONSTRAINT_TYPE legacyConstraint) { - SkCanvas::SrcRectConstraint constraint = (SkCanvas::SrcRectConstraint)legacyConstraint; - + const SkPaint& paint, SkCanvas::SrcRectConstraint constraint) { SkMatrix matrix; SkRect bitmapBounds, tmpSrc; @@ -1549,7 +1546,7 @@ void SkGpuDevice::drawImageRect(const SkDraw& draw, const SkImage* image, const SkCanvas::SrcRectConstraint constraint) { SkBitmap bm; if (wrap_as_bm(image, &bm)) { - this->drawBitmapRect(draw, bm, src, dst, paint, (SK_VIRTUAL_CONSTRAINT_TYPE)constraint); + this->drawBitmapRect(draw, bm, src, dst, paint, constraint); } } diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index ec3bfbdaab..8d557bc6b6 100644 --- a/src/gpu/SkGpuDevice.h +++ b/src/gpu/SkGpuDevice.h @@ -95,8 +95,7 @@ public: const SkMatrix&, const SkPaint&) override; virtual void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect* srcOrNull, const SkRect& dst, - const SkPaint& paint, - SK_VIRTUAL_CONSTRAINT_TYPE) override; + const SkPaint& paint, SkCanvas::SrcRectConstraint) override; virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, int x, int y, const SkPaint& paint) override; virtual void drawText(const SkDraw&, const void* text, size_t len, |