diff options
| author |  Mike Reed <reed@google.com> | 2017-03-17 09:50:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-17 14:27:33 +0000 |
| commit | e88a1cb20e6b4c9f099070112225a88693a4630b (patch) | |
| tree | c35774aef5ec56eb377d5bb9ed1ea2694e72efc6 /include/private | |
| parent | a392dbaa998e9f137103f7a7e86f89cb7224552f (diff) | |
Revert[2] "More SkVertices implementation work""
The fix was to release the array of vertices in the picturerecorder
destructor (where we also release textblobs etc.
This reverts commit 1eb3fef136bc75bd8e8ed717ec7c5d4ab26def62.
BUG=skia:
Change-Id: I3bf4acd6ad209205b0832a3cb7f94cd89dfcefc5
Reviewed-on: https://skia-review.googlesource.com/9826
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/SkRecords.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index b81bca87ee..ac492ec0ea 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -21,6 +21,7 @@ #include "SkRSXform.h" #include "SkString.h" #include "SkTextBlob.h" +#include "SkVertices.h" // Windows.h, will pull in all of the GDI defines. GDI #defines // DrawText to DrawTextA or DrawTextW, but SkRecord has a struct @@ -345,14 +346,8 @@ RECORD(DrawAtlas, kDraw_Tag|kHasImage_Tag|kHasPaint_Tag, Optional<SkRect> cull); RECORD(DrawVertices, kDraw_Tag|kHasPaint_Tag, SkPaint paint; - SkCanvas::VertexMode vmode; - int vertexCount; - PODArray<SkPoint> vertices; - PODArray<SkPoint> texs; - PODArray<SkColor> colors; - SkBlendMode bmode; - PODArray<uint16_t> indices; - int indexCount); + sk_sp<SkVertices> vertices; + SkBlendMode bmode); RECORD(DrawAnnotation, 0, // TODO: kDraw_Tag, skia:5548 SkRect rect; SkString key; |