More cleanup: streamline paths and bitmaps.
SkBitmapHeap is still used---now exclusively---by pipe.
BUG=skia:
Review URL: https://codereview.chromium.org/715413002
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index bac5586..6a577ca 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -10,7 +10,6 @@
#include "SkCanvas.h"
#include "SkFlattenable.h"
-#include "SkPathHeap.h"
#include "SkPicture.h"
#include "SkPictureData.h"
#include "SkTemplates.h"
@@ -82,10 +81,6 @@
return fWriter.snapshotAsData();
}
- const SkPathHeap* pathHeap() const {
- return fPathHeap.get();
- }
-
const SkPictureContentInfo& contentInfo() const {
return fContentInfo;
}
@@ -236,14 +231,12 @@
void recordSaveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags);
void recordRestore(bool fillInSkips = true);
- // Allocated in the constructor and managed by this class.
- SkBitmapHeap* fBitmapHeap;
-
private:
SkPictureContentInfo fContentInfo;
- SkAutoTUnref<SkPathHeap> fPathHeap;
- SkTArray<SkPaint> fPaints;
+ SkTArray<SkBitmap> fBitmaps;
+ SkTArray<SkPaint> fPaints;
+ SkTArray<SkPath> fPaths;
SkWriter32 fWriter;