Straighten out SkPicture::AccelData APIs.

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
 #define SkPicture_DEFINED
@@ skipping 23 matching lines @@
     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> {
 public:
-    // AccelData provides a base class for device-specific acceleration
-    // data. It is added to the picture via EXPERIMENTAL_addAccelData.
+    // AccelData provides a base class for device-specific acceleration data.
     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;
     };
 
     /**  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
      *  success, the SkBitmap should have its Config, width, height, rowBytes and pixelref set.
      *  If the installed pixelref has decoded the data into pixels, then the src buffer need not be
      *  copied. If the pixelref defers the actual decode until its lockPixels() is called, then it
      *  must make a copy of the src buffer.
      *  @param src Encoded data.
      *  @param length Size of the encoded data, in bytes.
@@ skipping 177 matching lines @@
     static const uint32_t MIN_PICTURE_VERSION = 35;     // Produced by Chrome M39.
     static const uint32_t CURRENT_PICTURE_VERSION = 41;
 
     static_assert(MIN_PICTURE_VERSION <= 41,
                   "Remove kFontFileName and related code from SkFontDescriptor.cpp.");
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     // Takes ownership of the (optional) SnapshotArray.
-    // For performance, we take ownership of the caller's refs on the SkRecord and BBH.
+    // For performance, we take ownership of the caller's refs on the SkRecord, BBH, and AccelData.
     SkPicture(const SkRect& cullRect,
               SkRecord*,
               SnapshotArray*,
               SkBBoxHierarchy*,
+              AccelData*,
               size_t approxBytesUsedBySubPictures);
 
     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;
     SkAutoTUnref<const SkRecord>          fRecord;
+    SkAutoTDelete<const SnapshotArray>    fDrawablePicts;
     SkAutoTUnref<const SkBBoxHierarchy>   fBBH;
-    SkAutoTDelete<const SnapshotArray>    fDrawablePicts;
+    SkAutoTUnref<const AccelData>         fAccelData;
     const size_t                          fApproxBytesUsedBySubPictures;
 
     // 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;
 
         uint8_t     fNumSlowPathsAndDashEffects;
         bool        fWillPlaybackBitmaps : 1;
         bool        fHasText             : 1;
     } fAnalysis;
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
     friend class SkRecordedDrawable;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 88, SkPictureSize);
 
 #endif