Revert of Add SkNVRefCnt, prune down SkPicture's size

include/core/SkPicture.h

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 22 matching lines @@
 
 namespace SkRecords {
     class CollectLayers;
 };
 
 /** \class SkPicture
 
     The SkPicture class records the drawing commands made to a canvas, to
     be played back at a later time.
 */
-class SK_API SkPicture : public SkNVRefCnt<SkPicture> {
+class SK_API SkPicture : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(SkPicture)
+
     // AccelData provides a base class for device-specific acceleration
     // data. It is added to the picture via EXPERIMENTAL_addAccelData.
     class AccelData : public SkRefCnt {
     public:
         typedef uint8_t Domain;
         typedef uint32_t Key;
 
         AccelData(Key key) : fKey(key) { }
 
         const Key& getKey() const { return fKey; }
 
         // This entry point allows user's to get a unique domain prefix
         // for their keys
         static Domain GenerateDomain();
     private:
         Key fKey;
+
+        typedef SkRefCnt INHERITED;
     };
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     void EXPERIMENTAL_addAccelData(const AccelData*) const;
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key) const;
 
     /**
      *  Function signature defining a function that sets up an SkBitmap from encoded data. On
@@ skipping 22 matching lines @@
     /**
      *  Recreate a picture that was serialized into a buffer. If the creation requires bitmap
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling SkPicture::CreateFromBuffer().
      *  @param SkReadBuffer Serialized picture data.
      *  @return A new SkPicture representing the serialized data, or NULL if the buffer is
      *          invalid.
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
 
-    ~SkPicture();
+    virtual ~SkPicture();
 
     /** Replays the drawing commands on the specified canvas. Note that
         this has the effect of unfurling this picture into the destination
         canvas. Using the SkCanvas::drawPicture entry point gives the destination
         canvas the option of just taking a ref.
         @param canvas the canvas receiving the drawing commands.
         @param callback a callback that allows interruption of playback
     */
     void playback(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
 
@@ skipping 142 matching lines @@
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     // Takes ownership of the SkRecord, refs the (optional) drawablePicts and BBH.
     SkPicture(const SkRect& cullRect, SkRecord*, SkData* drawablePicts,
               SkBBoxHierarchy*);
 
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
     static SkPictureData* Backport(const SkRecord&, const SkPictInfo&,
                                    SkPicture const* const drawablePics[], int drawableCount);
 
-    // uint32_t fRefCnt; from SkNVRefCnt<SkPicture>
-    mutable uint32_t fUniqueID;
     const SkRect                          fCullRect;
     mutable SkAutoTUnref<const AccelData> fAccelData;
     mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
     SkAutoTDelete<SkRecord>       fRecord;
     SkAutoTUnref<SkBBoxHierarchy> fBBH;
     SkAutoTUnref<SkData>          fDrawablePicts;
 
     // helpers for fDrawablePicts
     int drawableCount() const;
     // will return NULL if drawableCount() returns 0
     SkPicture const* const* drawablePicts() const;
 
     struct PathCounter;
 
     struct Analysis {
         Analysis() {}  // Only used by SkPictureData codepath.
         explicit Analysis(const SkRecord&);
 
         bool suitableForGpuRasterization(const char** reason, int sampleCount) const;
 
         bool        fWillPlaybackBitmaps;
         bool        fHasText;
         int         fNumPaintWithPathEffectUses;
         int         fNumFastPathDashEffects;
         int         fNumAAConcavePaths;
         int         fNumAAHairlineConcavePaths;
         int         fNumAADFEligibleConcavePaths;
     } fAnalysis;
+    mutable uint32_t fUniqueID;
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
+
+    typedef SkRefCnt INHERITED;
 };
-SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif