aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-06 22:07:17 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-06 22:07:17 +0000
commitf1715706f761e7e254f601abf33581702fa8fe17 (patch)
tree46f7f620470b8c4480a32f748981f03912c448c8 /include
parent2ebc10dd12a6fe55fda37a9bd5b1e0c1c1e08232 (diff)
add SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR, initially always on
BUG= Review URL: https://codereview.chromium.org/106183007 git-svn-id: http://skia.googlecode.com/svn/trunk@12552 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkPixelRef.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 4c564e40c2..2a31b152a7 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -16,6 +16,8 @@
#include "SkFlattenable.h"
#include "SkTDArray.h"
+#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR
+
#ifdef SK_DEBUG
/**
* Defining SK_IGNORE_PIXELREF_SETPRELOCKED will force all pixelref
@@ -49,7 +51,13 @@ class SK_API SkPixelRef : public SkFlattenable {
public:
SK_DECLARE_INST_COUNT(SkPixelRef)
+#ifdef SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR
+ // DEPRECATED -- use a constructor that takes SkImageInfo
explicit SkPixelRef(SkBaseMutex* mutex = NULL);
+#endif
+
+ explicit SkPixelRef(const SkImageInfo&);
+ explicit SkPixelRef(const SkImageInfo&, SkBaseMutex* mutex);
virtual ~SkPixelRef();
/** Return the pixel memory returned from lockPixels, or null if the