diff options
| author |  scroggo <scroggo@chromium.org> | 2015-07-31 14:29:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-31 14:29:26 -0700 |
| commit | aa80e425d810d6901266ce1457934de29e961dab (patch) | |
| tree | 6ae4f41568cacdcc0d7c67c6f01cc24cd5761cb5 | |
| parent | da9ccf175430fd9337355334503aedb464676078 (diff) | |
Fix straggling SK_VIRTUAL_CONSTRAINT_TYPEs
These were removed with crrev.com/1239193002, but a few were missed
in files that are only build on Android framework.
Brings the Android build one step closer to building.
Review URL: https://codereview.chromium.org/1268603003
| -rw-r--r-- | src/utils/android/SkAndroidSDKCanvas.cpp | 5 | ||||
| -rw-r--r-- | src/utils/android/SkAndroidSDKCanvas.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/utils/android/SkAndroidSDKCanvas.cpp b/src/utils/android/SkAndroidSDKCanvas.cpp index 2f988919d8..f0d3019dd2 100644 --- a/src/utils/android/SkAndroidSDKCanvas.cpp +++ b/src/utils/android/SkAndroidSDKCanvas.cpp @@ -143,10 +143,9 @@ void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, - SK_VIRTUAL_CONSTRAINT_TYPE constraint) { + SkCanvas::SrcRectConstraint constraint) { FILTER_PTR(paint); - fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, - (SrcRectConstraint)constraint); + fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, constraint); } void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, diff --git a/src/utils/android/SkAndroidSDKCanvas.h b/src/utils/android/SkAndroidSDKCanvas.h index d22931d4c9..ec1e9b82ed 100644 --- a/src/utils/android/SkAndroidSDKCanvas.h +++ b/src/utils/android/SkAndroidSDKCanvas.h @@ -43,7 +43,7 @@ protected: void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint) override; void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint* paint, SK_VIRTUAL_CONSTRAINT_TYPE) override; + const SkPaint* paint, SkCanvas::SrcRectConstraint) override; void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint* paint) override; void onDrawSprite(const SkBitmap& bitmap, int left, int top, |