diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 23 | ||||
| -rw-r--r-- | include/core/SkMultiPictureDraw.h | 2 | ||||
| -rw-r--r-- | include/core/SkPictureRecorder.h | 14 | ||||
| -rw-r--r-- | include/svg/SkSVGCanvas.h | 8 | ||||
| -rw-r--r-- | include/utils/SkCanvasStateUtils.h | 7 | ||||
| -rw-r--r-- | include/utils/SkNullCanvas.h | 8 |
6 files changed, 14 insertions, 48 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index ba8a3830d0..ab47edde51 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -60,13 +60,7 @@ class SkTextBlob; color, typeface, textSize, strokeWidth, shader (e.g. gradients, patterns), etc. */ -class SK_API SkCanvas -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT -: public SkRefCnt -#else -: SkNoncopyable -#endif -{ +class SK_API SkCanvas : public SkRefCnt { enum PrivateSaveLayerFlags { kDontClipToLayer_PrivateSaveLayerFlag = 1U << 31, }; @@ -106,22 +100,11 @@ public: * Note: it is valid to request a supported ImageInfo, but with zero * dimensions. */ - static std::unique_ptr<SkCanvas> MakeRasterDirect(const SkImageInfo&, void*, size_t); - - static std::unique_ptr<SkCanvas> MakeRasterDirectN32(int width, int height, SkPMColor* pixels, - size_t rowBytes) { - return MakeRasterDirect(SkImageInfo::MakeN32Premul(width, height), pixels, rowBytes); - } - -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT - static SkCanvas* NewRasterDirect(const SkImageInfo& info, void* pixels, size_t rowBytes) { - return MakeRasterDirect(info, pixels, rowBytes).release(); - } + static SkCanvas* NewRasterDirect(const SkImageInfo&, void*, size_t); static SkCanvas* NewRasterDirectN32(int width, int height, SkPMColor* pixels, size_t rowBytes) { - return MakeRasterDirectN32(width, height, pixels, rowBytes).release(); + return NewRasterDirect(SkImageInfo::MakeN32Premul(width, height), pixels, rowBytes); } -#endif /** * Creates an empty canvas with no backing device/pixels, and zero diff --git a/include/core/SkMultiPictureDraw.h b/include/core/SkMultiPictureDraw.h index 9995721ab9..cd46a303ae 100644 --- a/include/core/SkMultiPictureDraw.h +++ b/include/core/SkMultiPictureDraw.h @@ -57,7 +57,7 @@ public: private: struct DrawData { - SkCanvas* fCanvas; + SkCanvas* fCanvas; // reffed const SkPicture* fPicture; // reffed SkMatrix fMatrix; SkPaint* fPaint; // owned diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index a440790a73..59e8f14504 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -111,13 +111,13 @@ private: friend class SkPictureRecorderReplayTester; // for unit testing void partialReplay(SkCanvas* canvas) const; - bool fActivelyRecording; - uint32_t fFlags; - SkRect fCullRect; - sk_sp<SkBBoxHierarchy> fBBH; - std::unique_ptr<SkRecorder> fRecorder; - sk_sp<SkRecord> fRecord; - SkMiniRecorder fMiniRecorder; + bool fActivelyRecording; + uint32_t fFlags; + SkRect fCullRect; + sk_sp<SkBBoxHierarchy> fBBH; + sk_sp<SkRecorder> fRecorder; + sk_sp<SkRecord> fRecord; + SkMiniRecorder fMiniRecorder; typedef SkNoncopyable INHERITED; }; diff --git a/include/svg/SkSVGCanvas.h b/include/svg/SkSVGCanvas.h index b72f273123..e285faa459 100644 --- a/include/svg/SkSVGCanvas.h +++ b/include/svg/SkSVGCanvas.h @@ -25,13 +25,7 @@ public: * The 'bounds' parameter defines an initial SVG viewport (viewBox attribute on the root * SVG element). */ - static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkXMLWriter*); - -#ifdef SK_SUPPORT_LEGACY_CANVAS_IS_REFCNT - static SkCanvas* Create(const SkRect& bounds, SkXMLWriter* writer) { - return Make(bounds, writer).release(); - } -#endif + static SkCanvas* Create(const SkRect& bounds, SkXMLWriter*); }; #endif diff --git a/include/utils/SkCanvasStateUtils.h b/include/utils/SkCanvasStateUtils.h index fbc3a6f6e4..3071c7547c 100644 --- a/include/utils/SkCanvasStateUtils.h +++ b/include/utils/SkCanvasStateUtils.h @@ -62,12 +62,7 @@ public: * identical to the captured canvas. The caller is responsible for * 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 + static SkCanvas* CreateFromCanvasState(const SkCanvasState* state); /** * 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..99a26dafdd 100644 --- a/include/utils/SkNullCanvas.h +++ b/include/utils/SkNullCanvas.h @@ -15,12 +15,6 @@ class SkCanvas; /** * 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 +SK_API SkCanvas* SkCreateNullCanvas(); #endif |