Revert[2] of guard to remove DrawBitmapRectFlags
This reverts commit 91110195a2eee170c11885da9d16f94b00a39f87.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1240753003
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index ff52c15..8c7ba9b 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -73,7 +73,7 @@
canvas->drawBitmapRect(bitmap, &srcR, dstR, &paint,
SkCanvas::kStrict_SrcRectConstraint);
} else {
- canvas->drawBitmapRect(bitmap, &src[i], dstR, &paint);
+ canvas->drawBitmapRect(bitmap, src[i], dstR, &paint);
}
canvas->drawRect(dstR, paint);
@@ -143,7 +143,7 @@
SkRect srcR = { 0.5f, 0.5f, 2.5f, 2.5f };
SkRect dstR = { 100, 100, 300, 200 };
- canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL);
+ canvas->drawBitmapRect(bitmap, &srcR, dstR, NULL, SkCanvas::kStrict_SrcRectConstraint);
}
private:
@@ -213,16 +213,13 @@
SkRect dstR2 = { 10, 410, 30, 430 };
if (!fUseIRect) {
- canvas->drawBitmapRectToRect(fBigBitmap, &srcR1, dstR1, &paint);
- canvas->drawBitmapRectToRect(fBigBitmap, &srcR2, dstR2, &paint);
+ canvas->drawBitmapRect(fBigBitmap, &srcR1, dstR1, &paint,
+ SkCanvas::kStrict_SrcRectConstraint);
+ canvas->drawBitmapRect(fBigBitmap, &srcR2, dstR2, &paint,
+ SkCanvas::kStrict_SrcRectConstraint);
} else {
- SkIRect iSrcR1, iSrcR2;
-
- srcR1.roundOut(&iSrcR1);
- srcR2.roundOut(&iSrcR2);
-
- canvas->drawBitmapRect(fBigBitmap, &iSrcR1, dstR1, &paint);
- canvas->drawBitmapRect(fBigBitmap, &iSrcR2, dstR2, &paint);
+ canvas->drawBitmapRect(fBigBitmap, srcR1.roundOut(), dstR1, &paint);
+ canvas->drawBitmapRect(fBigBitmap, srcR2.roundOut(), dstR2, &paint);
}
}
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 715f45b..9db5ca7 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -79,30 +79,25 @@
return image_from_bitmap(*bm);
}
-static void canvasproc(SkCanvas* canvas, SkImage*, const SkBitmap& bm, const SkIRect* srcR,
+static void canvasproc(SkCanvas* canvas, SkImage*, const SkBitmap& bm, const SkIRect& srcR,
const SkRect& dstR) {
- canvas->drawBitmapRect(bm, srcR, dstR);
+ canvas->drawBitmapRect(bm, srcR, dstR, NULL);
}
-static void imageproc(SkCanvas* canvas, SkImage* image, const SkBitmap&, const SkIRect* srcIR,
+static void imageproc(SkCanvas* canvas, SkImage* image, const SkBitmap&, const SkIRect& srcR,
const SkRect& dstR) {
- SkRect storage, *srcR = NULL;
- if (srcIR) {
- storage.set(*srcIR);
- srcR = &storage;
- }
- canvas->drawImageRect(image, srcR, dstR);
+ canvas->drawImageRect(image, srcR, dstR, NULL);
}
-static void imagescaleproc(SkCanvas* canvas, SkImage* image, const SkBitmap&, const SkIRect* srcIR,
+static void imagescaleproc(SkCanvas* canvas, SkImage* image, const SkBitmap&, const SkIRect& srcIR,
const SkRect& dstR) {
const int newW = SkScalarRoundToInt(dstR.width());
const int newH = SkScalarRoundToInt(dstR.height());
- SkAutoTUnref<SkImage> newImage(image->newImage(newW, newH, srcIR));
+ SkAutoTUnref<SkImage> newImage(image->newImage(newW, newH, &srcIR));
#ifdef SK_DEBUG
const SkIRect baseR = SkIRect::MakeWH(image->width(), image->height());
- const bool containsSubset = !srcIR || baseR.contains(*srcIR);
+ const bool containsSubset = baseR.contains(srcIR);
#endif
if (newImage) {
@@ -121,7 +116,7 @@
}
}
-typedef void DrawRectRectProc(SkCanvas*, SkImage*, const SkBitmap&, const SkIRect*, const SkRect&);
+typedef void DrawRectRectProc(SkCanvas*, SkImage*, const SkBitmap&, const SkIRect&, const SkRect&);
static const int gSize = 1024;
static const int gBmpSize = 2048;
@@ -181,7 +176,7 @@
for (int h = 1; h <= kMaxSrcRectSize; h *= 4) {
SkIRect srcRect = SkIRect::MakeXYWH((gBmpSize - w) / 2, (gBmpSize - h) / 2, w, h);
- fProc(canvas, fImage, fLargeBitmap, &srcRect, dstRect);
+ fProc(canvas, fImage, fLargeBitmap, srcRect, dstRect);
SkString label;
label.appendf("%d x %d", w, h);
@@ -226,7 +221,7 @@
SkBlurMaskFilter::kHighQuality_BlurFlag |
SkBlurMaskFilter::kIgnoreTransform_BlurFlag);
paint.setMaskFilter(mf)->unref();
- canvas->drawBitmapRect(bm, &srcRect, dstRect, &paint);
+ canvas->drawBitmapRect(bm, srcRect, dstRect, &paint);
}
}
diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp
index 424aa3a..4581f10 100644
--- a/gm/tallstretchedbitmaps.cpp
+++ b/gm/tallstretchedbitmaps.cpp
@@ -88,7 +88,7 @@
SkRect dstRect = SkRect::MakeWH(SkIntToScalar(bmp.width()), 10.f * itemHeight);
SkPaint paint;
paint.setFilterQuality(kLow_SkFilterQuality);
- canvas->drawBitmapRect(bmp, &subRect, dstRect, &paint);
+ canvas->drawBitmapRect(bmp, subRect, dstRect, &paint);
canvas->translate(SkIntToScalar(bmp.width() + 10), 0);
}
}
diff --git a/gm/verylargebitmap.cpp b/gm/verylargebitmap.cpp
index 753786b..0dca1d7 100644
--- a/gm/verylargebitmap.cpp
+++ b/gm/verylargebitmap.cpp
@@ -45,7 +45,7 @@
r.offset(SkIntToScalar(150), 0);
// exercises extract bitmap, but not shader
- canvas->drawBitmapRect(bm, &ir, r, NULL);
+ canvas->drawBitmapRect(bm, ir, r, NULL);
canvas->drawRect(r, paint);
r.offset(SkIntToScalar(150), 0);