Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: include/core/SkPicture.h

Issue 617953002: Strip old backend recording down to essentials (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: debug-only Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/tests.gypi ('k') | include/core/SkPictureRecorder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index c41709d4beb8a0522164510e961b050208f14a7e..6e785d43da02d58f352ff87cd2066a611f94d01b 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -253,8 +253,7 @@ private:
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;
@@ -270,30 +269,14 @@ private:
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,
« no previous file with comments | « gyp/tests.gypi ('k') | include/core/SkPictureRecorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698