diff options
author | bungeman <bungeman@google.com> | 2015-08-03 07:56:16 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-03 07:56:16 -0700 |
commit | 1d58773c25873693c06e3c55e4a8591723202b54 (patch) | |
tree | 3590508c1b35c70e0261e2154cdfdd9fe9699fef /experimental | |
parent | f948b85a56f80b0c7e400b256d52c150ba925489 (diff) |
Update NulCanvas so everything builds.
SkNulCanvas.h is out of date, so the 'all' target fails.
Review URL: https://codereview.chromium.org/1270633004
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/PdfViewer/SkNulCanvas.h | 6 | ||||
-rw-r--r-- | experimental/PdfViewer/SkTrackDevice.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 452c58c41d..732ea3a7f0 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -82,10 +82,10 @@ protected: void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, const SkPaint* paint, - SK_VIRTUAL_CONSTRAINT_TYPE) override {} + SkCanvas::SrcRectConstraint) override {} void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override {} - void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint* - SRC_RECT_CONSTRAINT_PARAM(constraint)) override {} + void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*, + SkCanvas::SrcRectConstraint) override {} void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst, const SkPaint* paint = NULL) override {} void onDrawSprite(const SkBitmap& bitmap, int left, int top, diff --git a/experimental/PdfViewer/SkTrackDevice.h b/experimental/PdfViewer/SkTrackDevice.h index dfa20d1c21..6b351f6074 100644 --- a/experimental/PdfViewer/SkTrackDevice.h +++ b/experimental/PdfViewer/SkTrackDevice.h @@ -106,7 +106,7 @@ protected: void drawBitmapRect(const SkDraw& dummy1, const SkBitmap& dummy2, const SkRect* srcOrNull, const SkRect& dst, const SkPaint& paint, - SK_VIRTUAL_CONSTRAINT_TYPE flags) override { + SkCanvas::SrcRectConstraint flags) override { before(); INHERITED::drawBitmapRect(dummy1, dummy2, srcOrNull, dst, paint, flags); after(); |