Harden SkPicture interface a bit

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 182 matching lines @@
     static bool InternalOnly_StreamIsSKP(SkStream*, SkPictInfo*);
     static bool InternalOnly_BufferIsSKP(SkReadBuffer&, SkPictInfo*);
 
     /** Return true if the picture is suitable for rendering on the GPU.
      */
 
 #if SK_SUPPORT_GPU
     bool suitableForGpuRasterization(GrContext*, const char ** = NULL) const;
 #endif
 
-protected:
+private:
     // V2 : adds SkPixelRef's generation ID.
     // V3 : PictInfo tag at beginning, and EOF tag at the end
     // V4 : move SkPictInfo to be the header
     // V5 : don't read/write FunctionPtr on cross-process (we can detect that)
     // V6 : added serialization of SkPath's bounds (and packed its flags tighter)
     // V7 : changed drawBitmapRect(IRect) to drawBitmapRectToRect(Rect)
     // V8 : Add an option for encoding bitmaps
     // V9 : Allow the reader and writer of an SKP disagree on whether to support
     //      SK_SUPPORT_HINTING_SCALE_FACTOR
     // V10: add drawRRect, drawOval, clipRRect
@@ skipping 20 matching lines @@
 
     // Note: If the picture version needs to be increased then please follow the
     // steps to generate new SKPs in (only accessible to Googlers): http://goo.gl/qATVcw
 
     // Only SKPs within the min/current picture version range (inclusive) can be read.
     static const uint32_t MIN_PICTURE_VERSION = 19;
     static const uint32_t CURRENT_PICTURE_VERSION = 29;
 
     mutable uint32_t      fUniqueID;
 
-    // TODO: make fData and fWidth/fHeight private
-    SkAutoTDelete<SkPictureData> fData;
+    SkAutoTDelete<const SkPictureData> fData;
     int                   fWidth, fHeight;
     mutable SkAutoTUnref<const AccelData> fAccelData;
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
 
     // Create a new SkPicture from an existing SkPictureData. Ref count of
     // data is unchanged.
     SkPicture(SkPictureData* data, int width, int height);
 
     SkPicture(int width, int height, const SkPictureRecord& record, bool deepCopyOps);
 
-private:
     static void WriteTagSize(SkWriteBuffer& buffer, uint32_t tag, size_t size);
     static void WriteTagSize(SkWStream* stream, uint32_t tag, size_t size);
 
     // An OperationList encapsulates a set of operation offsets into the picture byte
     // stream along with the CTMs needed for those operation.
     class OperationList : ::SkNoncopyable {
     public:
         // The following three entry points should only be accessed if
         // 'valid' returns true.
         int numOps() const { return fOps.count(); }
@@ skipping 23 matching lines @@
     friend class SkPicturePlayback; // to get fData
 
     typedef SkRefCnt INHERITED;
 
     SkPicture(int width, int height, SkRecord*);  // Takes ownership.
     SkAutoTDelete<SkRecord> fRecord;
     bool fRecordWillPlayBackBitmaps; // TODO: const
 };
 
 #endif