Index: include/core/SkPixelRef.h |
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h |
index 1a6c6f80808cd69383ef8e97ab96dbdfb44842bb..e611dc0ef8b852a5ee0e79e74b2fb9316c9f69e7 100644 |
--- a/include/core/SkPixelRef.h |
+++ b/include/core/SkPixelRef.h |
@@ -16,8 +16,6 @@ |
#include "SkFlattenable.h" |
#include "SkTDArray.h" |
-//#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR |
- |
#ifdef SK_DEBUG |
/** |
* Defining SK_IGNORE_PIXELREF_SETPRELOCKED will force all pixelref |
@@ -51,11 +49,6 @@ 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&); |
SkPixelRef(const SkImageInfo&, SkBaseMutex* mutex); |
virtual ~SkPixelRef(); |
@@ -300,9 +293,8 @@ protected: |
private: |
SkBaseMutex* fMutex; // must remain in scope for the life of this object |
- // FIXME: fInfo should be const once we remove old constructor that does |
- // not set it. |
- SkImageInfo fInfo; |
+ |
+ const SkImageInfo fInfo; |
void* fPixels; |
SkColorTable* fColorTable; // we do not track ownership, subclass does |