Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: include/core/SkCanvas.h

Issue 1281123002: remove unneeded _DRAWIMAGERECT flags (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/core/SkCanvas.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index ed52ee85d340df41252e7c9055b1450e39703395..1d5baeee5687674c157f93df3727cc5783fc907a 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -37,9 +37,6 @@ class SkSurface;
class SkSurface_Base;
class SkTextBlob;
-//#define SK_SUPPORT_LEGACY_SIMPLE_DRAWIMAGERECT
-//#define SK_SUPPORT_LEGACY_SRCPTR_DRAWIMAGERECT
-
/** \class SkCanvas
A Canvas encapsulates all of the state about drawing into a device (bitmap).
@@ -829,21 +826,8 @@ public:
void drawImageRect(const SkImage* image, const SkIRect& isrc, const SkRect& dst,
const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
// variant that assumes src == image-bounds
-#ifdef SK_SUPPORT_LEGACY_SIMPLE_DRAWIMAGERECT
- void drawImageRect(const SkImage* image, const SkRect& dst, const SkPaint* paint = NULL);
-#else
void drawImageRect(const SkImage* image, const SkRect& dst, const SkPaint* paint,
SrcRectConstraint = kStrict_SrcRectConstraint);
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_SRCPTR_DRAWIMAGERECT
- void drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
- const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
-
- void drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst) {
- this->drawImageRect(image, src, dst, NULL, kStrict_SrcRectConstraint);
- }
-#endif
/**
* Draw the image stretched differentially to fit into dst.
@@ -897,17 +881,8 @@ public:
// variant where src is SkIRect
void drawBitmapRect(const SkBitmap& bitmap, const SkIRect& isrc, const SkRect& dst,
const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
-#ifdef SK_SUPPORT_LEGACY_SIMPLE_DRAWIMAGERECT
- void drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint* paint = NULL);
-#else
void drawBitmapRect(const SkBitmap& bitmap, const SkRect& dst, const SkPaint* paint,
SrcRectConstraint = kStrict_SrcRectConstraint);
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_SRCPTR_DRAWIMAGERECT
- void drawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
- const SkPaint* paint, SrcRectConstraint = kStrict_SrcRectConstraint);
-#endif
/**
* Draw the bitmap stretched differentially to fit into dst.
« no previous file with comments | « no previous file | src/core/SkCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698