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/utils/debugger | |
| parent | 91f283bb4e6ea71bbd4e6efc27befc29118ee543 (diff) | |
remove all guards for changes to drawBitmapRect / drawImageRect
BUG=skia:
Review URL: https://codereview.chromium.org/1239193002
Diffstat (limited to 'src/utils/debugger')
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 5 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 1d798787fa..1066d2b94f 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -415,7 +415,7 @@ void SkDebugCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar left, } void SkDebugCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint* paint, SK_VIRTUAL_CONSTRAINT_TYPE constraint) { + const SkPaint* paint, SrcRectConstraint constraint) { this->addDrawCommand(new SkDrawBitmapRectCommand(bitmap, src, dst, paint, (SrcRectConstraint)constraint)); } @@ -431,8 +431,7 @@ void SkDebugCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar to } void SkDebugCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, - const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) { - SRC_RECT_CONSTRAINT_LOCAL_DEFAULT(constraint); + const SkPaint* paint, SrcRectConstraint constraint) { this->addDrawCommand(new SkDrawImageRectCommand(image, src, dst, paint, constraint)); } diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index 4f5f226e82..e0aed6223d 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -198,10 +198,10 @@ protected: void onDrawPath(const SkPath&, const SkPaint&) override; void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - SK_VIRTUAL_CONSTRAINT_TYPE) override; + SrcRectConstraint) override; void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint* SRC_RECT_CONSTRAINT_PARAM(constraint)) override; + const SkPaint*, SrcRectConstraint) override; void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, const SkPaint*) override; void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; |