aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2015-07-17 05:57:34 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-17 05:57:34 -0700
commit91110195a2eee170c11885da9d16f94b00a39f87 (patch)
tree4dc22ce2b05e9cde0369d2f4d97bb18cd8d2f6aa /src
parentac66a8122b27c388cc74b3913d9a9be351a44e54 (diff)
Revert of guard to remove DrawBitmapRectFlags (patchset #1 id:1 of https://codereview.chromium.org/1235393003/)
Reason for revert: breaking android framework build Original issue's description: > guard to remove DrawBitmapRectFlags > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/6fb0b6779e40ce05c20cf279f0ecff31fa3cd60d TBR=fmalita@chromium.org,djsollen@google.com,reed@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1230823007
Diffstat (limited to 'src')
-rw-r--r--src/core/SkCanvas.cpp14
-rwxr-xr-xsrc/effects/SkTestImageFilters.cpp2
-rw-r--r--src/gpu/SkGr.cpp2
-rw-r--r--src/utils/SkNinePatch.cpp4
-rw-r--r--src/utils/debugger/SkDrawCommand.cpp2
5 files changed, 5 insertions, 19 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 570435869b..403a12d6a2 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1853,12 +1853,6 @@ void SkCanvas::drawImageRect(const SkImage* image, const SkRect* src, const SkRe
this->onDrawImageRect(image, src, dst, paint SRC_RECT_CONSTRAINT_ARG(constraint));
}
-void SkCanvas::drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst,
- const SkPaint* paint, SrcRectConstraint constraint) {
- SkRect src = SkRect::Make(isrc);
- this->drawImageRect(image, &src, dst, paint, constraint);
-}
-
void SkCanvas::drawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
const SkPaint* paint) {
if (dst.isEmpty()) {
@@ -1877,7 +1871,6 @@ void SkCanvas::drawBitmap(const SkBitmap& bitmap, SkScalar dx, SkScalar dy, cons
this->onDrawBitmap(bitmap, dx, dy, paint);
}
-#ifdef SK_SUPPORT_LEGACY_DRAWBITMAPRECTFLAGS_TYPE
void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
const SkPaint* paint, DrawBitmapRectFlags flags) {
if (bitmap.drawsNothing() || dst.isEmpty()) {
@@ -1885,7 +1878,6 @@ void SkCanvas::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src, c
}
this->onDrawBitmapRect(bitmap, src, dst, paint, (SK_VIRTUAL_CONSTRAINT_TYPE)flags);
}
-#endif
void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
const SkPaint* paint, SrcRectConstraint constraint) {
@@ -1895,12 +1887,6 @@ void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const S
this->onDrawBitmapRect(bitmap, src, dst, paint, (SK_VIRTUAL_CONSTRAINT_TYPE)constraint);
}
-void SkCanvas::drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst,
- const SkPaint* paint, SrcRectConstraint constraint) {
- SkRect src = SkRect::Make(isrc);
- this->drawBitmapRect(bitmap, &src, dst, paint, constraint);
-}
-
void SkCanvas::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
const SkPaint* paint) {
if (bitmap.drawsNothing() || dst.isEmpty()) {
diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp
index cd277ec225..ea5560fe21 100755
--- a/src/effects/SkTestImageFilters.cpp
+++ b/src/effects/SkTestImageFilters.cpp
@@ -71,7 +71,7 @@ bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
SkRect r = SkRect::MakeWH(SkIntToScalar(src.width()),
SkIntToScalar(src.height()));
- canvas.drawBitmapRect(tmp, r);
+ canvas.drawBitmapRect(tmp, NULL, r, NULL);
*result = dev->accessBitmap(false);
}
return true;
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 3334095a95..bb04131245 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -529,7 +529,7 @@ static SkBitmap stretch_on_cpu(const SkBitmap& bmp, const Stretch& stretch) {
break;
}
SkRect dstRect = SkRect::MakeWH(SkIntToScalar(stretch.fWidth), SkIntToScalar(stretch.fHeight));
- canvas.drawBitmapRect(bmp, dstRect, &paint);
+ canvas.drawBitmapRectToRect(bmp, NULL, dstRect, &paint);
return stretched;
}
diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp
index 4a5308bb07..ce8d4801c6 100644
--- a/src/utils/SkNinePatch.cpp
+++ b/src/utils/SkNinePatch.cpp
@@ -136,7 +136,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
const int numYStretch = (numYDivs + 1) >> 1;
if (numXStretch < 1 && numYStretch < 1) {
- canvas->drawBitmapRect(bitmap, bounds, paint);
+ canvas->drawBitmapRect(bitmap, NULL, bounds, paint);
return;
}
@@ -293,7 +293,7 @@ static void drawNineViaRects(SkCanvas* canvas, const SkRect& dst,
s.fRight = srcX[x+1];
d.fLeft = dstX[x];
d.fRight = dstX[x+1];
- canvas->drawBitmapRect(bitmap, s, d, paint);
+ canvas->drawBitmapRect(bitmap, &s, d, paint);
}
}
}
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
index 1d28d2e8e0..5f0f74ffc0 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/src/utils/debugger/SkDrawCommand.cpp
@@ -129,7 +129,7 @@ void render_bitmap(SkCanvas* canvas, const SkBitmap& input, const SkRect* srcRec
yScale * input.height());
canvas->clear(0xFFFFFFFF);
- canvas->drawBitmapRect(input, dst);
+ canvas->drawBitmapRect(input, NULL, dst);
if (srcRect) {
SkRect r = SkRect::MakeLTRB(srcRect->fLeft * xScale + SK_Scalar1,