First version of bitmap use tracking in SkPictureRecord

src/core/SkPictureRecord.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureRecord_DEFINED
 #define SkPictureRecord_DEFINED
 
 #include "SkCanvas.h"
 #include "SkFlattenable.h"
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
 #include "SkMatrixClipStateMgr.h"
 #endif
 #include "SkPathHeap.h"
 #include "SkPicture.h"
 #include "SkPictureFlat.h"
 #include "SkTemplates.h"
 #include "SkWriter32.h"
 
+class SkBBoxHierarchy;
+class SkOffsetTable;
 class SkPictureStateTree;
-class SkBBoxHierarchy;
 
 // These macros help with packing and unpacking a single byte value and
 // a 3 byte value into/out of a uint32_t
 #define MASK_24 0x00FFFFFF
 #define UNPACK_8_24(combined, small, large)             \
     small = (combined >> 24) & 0xFF;                    \
     large = combined & MASK_24;
 #define PACK_8_24(small, large) ((small << 24) | large)
 
 
@@ skipping 123 matching lines @@
         return offset;
     }
 
     void addInt(int value) {
         fWriter.writeInt(value);
     }
     void addScalar(SkScalar scalar) {
         fWriter.writeScalar(scalar);
     }
 
-    void addBitmap(const SkBitmap& bitmap);
+    // The command at 'offset' in the skp uses the specified bitmap
+    void trackBitmapUse(int bitmapID, size_t offset);
+    int addBitmap(const SkBitmap& bitmap);
     void addMatrix(const SkMatrix& matrix);
     const SkFlatData* addPaint(const SkPaint& paint) { return this->addPaintPtr(&paint); }
     const SkFlatData* addPaintPtr(const SkPaint* paint);
     void addFlatPaint(const SkFlatData* flatPaint);
     void addPath(const SkPath& path);
     void addPicture(SkPicture& picture);
     void addPoint(const SkPoint& point);
     void addPoints(const SkPoint pts[], int count);
     void addRect(const SkRect& rect);
     void addRectPtr(const SkRect* rect);
@@ skipping 109 matching lines @@
     SkPathHeap* fPathHeap;  // reference counted
     SkWriter32 fWriter;
 
     // we ref each item in these arrays
     SkTDArray<SkPicture*> fPictureRefs;
 
     uint32_t fRecordFlags;
     bool     fOptsEnabled;
     int      fInitialSaveCount;
 
+    SkAutoTUnref<SkOffsetTable> fBitmapUseOffsets;
+
     friend class SkPicturePlayback;
     friend class SkPictureTester; // for unit testing
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     SkMatrixClipStateMgr fMCMgr;
 #endif
 
     typedef SkCanvas INHERITED;
 };
 
 #endif