diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 18:07:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-02 18:07:46 +0000 |
| commit | 33cc989f23d091be2463ada7c12e334be204a80f (patch) | |
| tree | d6198e38e924534d121c65142c6600d72bf66627 /include | |
| parent | 1bed687f6b8fc67336f0f5d6fb5a5b38dd0fdff9 (diff) | |
remove SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR and make fInfo const
BUG=
R=halcanary@google.com
Review URL: https://codereview.chromium.org/107373004
git-svn-id: http://skia.googlecode.com/svn/trunk@12863 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPixelRef.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index 1a6c6f8080..e611dc0ef8 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 |