diff options
author | reed <reed@google.com> | 2015-07-14 10:54:12 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 10:54:12 -0700 |
commit | a5517e2b190a8083b38964972b031c13e99f1012 (patch) | |
tree | 16fc3439de41b3af1e85c360904e96c44a2b8078 /src/core/SkRecords.h | |
parent | 4abc186d029c3c57a53cec3f483de2fff6d4a954 (diff) |
add src-rect-constraint to drawImageRect
Follow-on work
- unify around SrcRectConstraint (i.e. drawBitmapRect)
- remove silly drawBitmapRectToRect alias
- clean-up (possibly remove) alias problems around drawBitmapRect + IRect parameter
BUG=skia:
Review URL: https://codereview.chromium.org/1228083004
Diffstat (limited to 'src/core/SkRecords.h')
-rw-r--r-- | src/core/SkRecords.h | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/core/SkRecords.h b/src/core/SkRecords.h index 074a560c04..9ab04c91e4 100644 --- a/src/core/SkRecords.h +++ b/src/core/SkRecords.h @@ -40,9 +40,9 @@ namespace SkRecords { M(ClipRegion) \ M(DrawBitmap) \ M(DrawBitmapNine) \ - M(DrawBitmapRectToRect) \ - M(DrawBitmapRectToRectBleed) \ - M(DrawBitmapRectToRectFixedSize) \ + M(DrawBitmapRect) \ + M(DrawBitmapRectFast) \ + M(DrawBitmapRectFixedSize) \ M(DrawDrawable) \ M(DrawImage) \ M(DrawImageRect) \ @@ -276,29 +276,30 @@ RECORD4(DrawBitmapNine, Optional<SkPaint>, paint, ImmutableBitmap, bitmap, SkIRect, center, SkRect, dst); -RECORD4(DrawBitmapRectToRect, Optional<SkPaint>, paint, - ImmutableBitmap, bitmap, - Optional<SkRect>, src, - SkRect, dst); -RECORD4(DrawBitmapRectToRectBleed, Optional<SkPaint>, paint, - ImmutableBitmap, bitmap, - Optional<SkRect>, src, - SkRect, dst); -RECORD5(DrawBitmapRectToRectFixedSize, SkPaint, paint, - ImmutableBitmap, bitmap, - SkRect, src, - SkRect, dst, - SkCanvas::DrawBitmapRectFlags, flags); +RECORD4(DrawBitmapRect, Optional<SkPaint>, paint, + ImmutableBitmap, bitmap, + Optional<SkRect>, src, + SkRect, dst); +RECORD4(DrawBitmapRectFast, Optional<SkPaint>, paint, + ImmutableBitmap, bitmap, + Optional<SkRect>, src, + SkRect, dst); +RECORD5(DrawBitmapRectFixedSize, SkPaint, paint, + ImmutableBitmap, bitmap, + SkRect, src, + SkRect, dst, + SkCanvas::SrcRectConstraint, constraint); RECORD3(DrawDRRect, SkPaint, paint, SkRRect, outer, SkRRect, inner); RECORD3(DrawDrawable, Optional<SkMatrix>, matrix, SkRect, worstCaseBounds, int32_t, index); RECORD4(DrawImage, Optional<SkPaint>, paint, RefBox<const SkImage>, image, SkScalar, left, SkScalar, top); -RECORD4(DrawImageRect, Optional<SkPaint>, paint, +RECORD5(DrawImageRect, Optional<SkPaint>, paint, RefBox<const SkImage>, image, Optional<SkRect>, src, - SkRect, dst); + SkRect, dst, + SkCanvas::SrcRectConstraint, constraint); RECORD4(DrawImageNine, Optional<SkPaint>, paint, RefBox<const SkImage>, image, SkIRect, center, |