diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-03 09:42:58 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-03 15:22:16 +0000 |
| commit | f8334781914363caf537f22f012fcd5c03c60dad (patch) | |
| tree | cfa54aa4a80cd7841959300c245d633fbcd382a0 /src/gpu/text/GrAtlasTextBlob.h | |
| parent | 5f500920e719b215d5e0e36a6679995ed3c9b4ad (diff) | |
Remove ref counting from GrOp.
Instead use std::unique_ptr to manage GrOp lifetime.
Change-Id: Ic1dc1e0ffd7254c3994221f498677af5bbf66a71
Reviewed-on: https://skia-review.googlesource.com/6479
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 9b3f59c834..340b52a41b 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -279,11 +279,12 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////// // Internal test methods - sk_sp<GrDrawOp> test_makeOp(int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, - SkScalar x, SkScalar y, GrColor color, const SkPaint& skPaint, - const SkSurfaceProps& props, - const GrDistanceFieldAdjustTable* distanceAdjustTable, - GrAtlasGlyphCache* cache); + std::unique_ptr<GrDrawOp> test_makeOp(int glyphCount, int run, int subRun, + const SkMatrix& viewMatrix, SkScalar x, SkScalar y, + GrColor color, const SkPaint& skPaint, + const SkSurfaceProps& props, + const GrDistanceFieldAdjustTable* distanceAdjustTable, + GrAtlasGlyphCache* cache); private: GrAtlasTextBlob() @@ -500,11 +501,13 @@ private: Run* run, Run::SubRunInfo* info, SkAutoGlyphCache*, int glyphCount, size_t vertexStride, GrColor color, SkScalar transX, SkScalar transY) const; - inline sk_sp<GrDrawOp> makeOp(const Run::SubRunInfo& info, int glyphCount, int run, int subRun, - const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, - const SkPaint& skPaint, const SkSurfaceProps& props, - const GrDistanceFieldAdjustTable* distanceAdjustTable, - bool useGammaCorrectDistanceTable, GrAtlasGlyphCache* cache); + inline std::unique_ptr<GrDrawOp> makeOp(const Run::SubRunInfo& info, int glyphCount, int run, + int subRun, const SkMatrix& viewMatrix, SkScalar x, + SkScalar y, GrColor color, const SkPaint& skPaint, + const SkSurfaceProps& props, + const GrDistanceFieldAdjustTable* distanceAdjustTable, + bool useGammaCorrectDistanceTable, + GrAtlasGlyphCache* cache); struct BigGlyph { BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool treatAsBMP) |