diff options
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 1bbe38ece8..1801e25210 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -264,7 +264,7 @@ public: * SkAutoGlyphCache is passed to multiple calls of regenInBatch then it can save the cost of * multiple detach/attach operations of SkGlyphCache. */ - void regenInBatch(GrDrawBatch::Target* target, GrBatchFontCache* fontCache, + void regenInBatch(GrDrawOp::Target* target, GrBatchFontCache* fontCache, GrBlobRegenHelper *helper, int run, int subRun, SkAutoGlyphCache*, size_t vertexStride, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, void** vertices, size_t* byteCount, int* glyphCount); @@ -279,11 +279,11 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////// // Internal test methods - GrDrawBatch* test_createBatch(int glyphCount, int run, int subRun, - const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, - const SkPaint& skPaint, const SkSurfaceProps& props, - const GrDistanceFieldAdjustTable* distanceAdjustTable, - GrBatchFontCache* cache); + GrDrawOp* test_createBatch(int glyphCount, int run, int subRun, + const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color, + const SkPaint& skPaint, const SkSurfaceProps& props, + const GrDistanceFieldAdjustTable* distanceAdjustTable, + GrBatchFontCache* cache); private: GrAtlasTextBlob() @@ -496,7 +496,7 @@ private: }; template <bool regenPos, bool regenCol, bool regenTexCoords, bool regenGlyphs> - void regenInBatch(GrDrawBatch::Target* target, + void regenInBatch(GrDrawOp::Target* target, GrBatchFontCache* fontCache, GrBlobRegenHelper* helper, Run* run, Run::SubRunInfo* info, @@ -505,14 +505,14 @@ private: GrColor color, SkScalar transX, SkScalar transY) const; - inline GrDrawBatch* createBatch(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, - GrBatchFontCache* cache); + inline GrDrawOp* createBatch(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, + GrBatchFontCache* cache); struct BigGlyph { BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool treatAsBMP) |