Strip old backend recording down to essentials

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 235 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 = 36;
 
     mutable uint32_t      fUniqueID;
 
-    // TODO: make SkPictureData const when clone method goes away
-    SkAutoTDelete<SkPictureData> fData;
+    SkAutoTDelete<const SkPictureData>    fData;
     const SkScalar                        fCullWidth;
     const SkScalar                        fCullHeight;
     mutable SkAutoTUnref<const AccelData> fAccelData;
 
     mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
     void callDeletionListeners();
 
     // Create a new SkPicture from an existing SkPictureData. The new picture
     // takes ownership of 'data'.
     SkPicture(SkPictureData* data, SkScalar width, SkScalar height);
 
     SkPicture(SkScalar width, SkScalar height, const SkPictureRecord& record, bool deepCopyOps);
 
-    // 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(); }
-        // The offset in the picture of the operation to execute.
-        uint32_t offset(int index) const;
-        // The CTM that must be installed for the operation to behave correctly
-        const SkMatrix& matrix(int index) const;
-
-        SkTDArray<void*> fOps;
-    };
-
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
-    friend class SkPictureData;                // to access OperationList
     friend class SkPictureRecorder;            // just for SkPicture-based constructor
     friend class SkGpuDevice;                  // for fData access
     friend class GrLayerHoister;               // access to fRecord
     friend class CollectLayers;                // access to fRecord
-    friend class SkPicturePlayback;            // to get fData & OperationList
+    friend class SkPicturePlayback;            // to get fData
     friend void GrRecordReplaceDraw(const SkPicture* picture,
                                     SkCanvas* canvas,
                                     const GrReplacements* replacements,
                                     const SkMatrix& initialMatrix,
                                     SkDrawPictureCallback* callback);
 
     typedef SkRefCnt INHERITED;
 
     // Takes ownership of the SkRecord, refs the (optional) BBH.
     SkPicture(SkScalar width, SkScalar height, SkRecord*, SkBBoxHierarchy*);
@@ skipping 14 matching lines @@
         bool        fWillPlaybackBitmaps;
         bool        fHasText;
         int         fNumPaintWithPathEffectUses;
         int         fNumFastPathDashEffects;
         int         fNumAAConcavePaths;
         int         fNumAAHairlineConcavePaths;
     } fAnalysis;
 };
 
 #endif