diff options
author | Mike Reed <reed@google.com> | 2016-12-07 16:52:58 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-07 22:28:04 +0000 |
commit | 02b7349af7ce61c3f7d301148b54e17877233030 (patch) | |
tree | 3d532c728ac070b06ce9c0b197646288c7ba4118 /include/utils | |
parent | 867812e2ef3d2f03f3bbc7f80bc1fb74659c74b4 (diff) |
no need for SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT anymore
BUG=skia:
Change-Id: If0aa01beb8be9bd7d9a3a5b23c795223b02f02d3
Reviewed-on: https://skia-review.googlesource.com/5690
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'include/utils')
-rw-r--r-- | include/utils/SkCanvasStateUtils.h | 5 | ||||
-rw-r--r-- | include/utils/SkNullCanvas.h | 10 |
2 files changed, 1 insertions, 14 deletions
diff --git a/include/utils/SkCanvasStateUtils.h b/include/utils/SkCanvasStateUtils.h index fbc3a6f6e4..23cada8e2f 100644 --- a/include/utils/SkCanvasStateUtils.h +++ b/include/utils/SkCanvasStateUtils.h @@ -63,11 +63,6 @@ public: * calling unref on the SkCanvas. */ static std::unique_ptr<SkCanvas> MakeFromCanvasState(const SkCanvasState* state); -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT - static SkCanvas* CreateFromCanvasState(const SkCanvasState* state) { - return MakeFromCanvasState(state).release(); - } -#endif /** * Free the memory associated with the captured canvas state. The state diff --git a/include/utils/SkNullCanvas.h b/include/utils/SkNullCanvas.h index 884b68bfb1..8e5e0acd86 100644 --- a/include/utils/SkNullCanvas.h +++ b/include/utils/SkNullCanvas.h @@ -8,19 +8,11 @@ #ifndef SkNullCanvas_DEFINED #define SkNullCanvas_DEFINED -#include "SkBitmap.h" - -class SkCanvas; +#include "SkCanvas.h" /** * Creates a canvas that draws nothing. This is useful for performance testing. */ SK_API std::unique_ptr<SkCanvas> SkMakeNullCanvas(); -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT -static inline SkCanvas* SkCreateNullCanvas() { - return SkMakeNullCanvas().release(); -} -#endif - #endif |