Start stripping out complicated parts of SkPicture{Record,Data}.
First step: no more paint flattening or deduplication.
BUG=skia:
Review URL: https://codereview.chromium.org/723593002
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 40ecc6a..00c51ac 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -31,12 +31,9 @@
SkPictureRecord::SkPictureRecord(const SkISize& dimensions, uint32_t flags)
: INHERITED(dimensions.width(), dimensions.height())
- , fFlattenableHeap(HEAP_BLOCK_SIZE)
- , fPaints(&fFlattenableHeap)
, fRecordFlags(flags) {
fBitmapHeap = SkNEW(SkBitmapHeap);
- fFlattenableHeap.setBitmapStorage(fBitmapHeap);
fFirstSavedLayerIndex = kNoSavedLayerIndex;
fInitialSaveCount = kNoInitialSave;
@@ -44,7 +41,6 @@
SkPictureRecord::~SkPictureRecord() {
SkSafeUnref(fBitmapHeap);
- fFlattenableHeap.setBitmapStorage(NULL);
fPictureRefs.unrefAll();
fTextBlobRefs.unrefAll();
}
@@ -926,9 +922,8 @@
fContentInfo.onAddPaintPtr(paint);
if (paint) {
- const SkFlatData* flat = fPaints.findAndReturnFlat(*paint);
- SkASSERT(flat && flat->index() != 0);
- this->addInt(flat->index());
+ fPaints.push_back(*paint);
+ this->addInt(fPaints.count());
} else {
this->addInt(0);
}