From 1eb3fef136bc75bd8e8ed717ec7c5d4ab26def62 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 17 Mar 2017 13:09:38 +0000 Subject: Revert "More SkVertices implementation work" This reverts commit 14583e11fd622c686993b741499060a6f3527055. Reason for revert: leaking Direct leak of 499104 byte(s) in 2112 object(s) allocated from: #0 0x1e195f0 in operator new(unsigned long) (/b/swarm_slave/w/irazbR79/out/Debug/dm+0x1e195f0) #1 0x3142b0a in SkVertices::Builder::init(SkCanvas::VertexMode, int, int, SkVertices::Sizes const&) (/b/swarm_slave/w/irazbR79/out/Debug/dm+0x3142b0a) Original change's description: > More SkVertices implementation work > > - change virtuals to take const SkVertices*, as we do for TextBobs and Images > - override onDrawVerticesObject in recording canvases > - deserialize raw-vertices into SkVertices object > > Possibly a follow-on would intercept the raw-form directly in canvas, > and remove the virtual, and only support the object form. > > BUG=skia:6366 > > Change-Id: I57a932667ccb3b3b004beb802ac3ae6898e3c6e0 > Reviewed-on: https://skia-review.googlesource.com/9633 > Commit-Queue: Mike Reed > Reviewed-by: Brian Salomon > TBR=bsalomon@google.com,reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6366 Change-Id: I40bb7a20698ef6aa0a9ef71a3d6ac4c1473e081c Reviewed-on: https://skia-review.googlesource.com/9825 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- src/core/SkPictureData.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/core/SkPictureData.h') diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h index 37a02373be..332b799638 100644 --- a/src/core/SkPictureData.h +++ b/src/core/SkPictureData.h @@ -68,7 +68,6 @@ public: #define SK_PICT_PAINT_BUFFER_TAG SkSetFourByteTag('p', 'n', 't', ' ') #define SK_PICT_PATH_BUFFER_TAG SkSetFourByteTag('p', 't', 'h', ' ') #define SK_PICT_TEXTBLOB_BUFFER_TAG SkSetFourByteTag('b', 'l', 'o', 'b') -#define SK_PICT_VERTICES_BUFFER_TAG SkSetFourByteTag('v', 'e', 'r', 't') #define SK_PICT_IMAGE_BUFFER_TAG SkSetFourByteTag('i', 'm', 'a', 'g') // Always write this guy last (with no length field afterwards) @@ -144,11 +143,6 @@ public: return reader->validateIndex(index, fTextBlobCount) ? fTextBlobRefs[index] : nullptr; } - const SkVertices* getVertices(SkReadBuffer* reader) const { - const int index = reader->readInt() - 1; - return reader->validateIndex(index, fVerticesCount) ? fVerticesRefs[index] : nullptr; - } - #if SK_SUPPORT_GPU /** * sampleCount is the number of samples-per-pixel or zero if non-MSAA. @@ -191,8 +185,6 @@ private: int fDrawableCount; const SkTextBlob** fTextBlobRefs; int fTextBlobCount; - const SkVertices** fVerticesRefs; - int fVerticesCount; const SkImage** fImageRefs; int fImageCount; const SkImage** fBitmapImageRefs; -- cgit v1.2.3