diff options
Diffstat (limited to 'src/gpu/text/GrAtlasTextContext.h')
-rw-r--r-- | src/gpu/text/GrAtlasTextContext.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h index 94a9cffba1..2168b7e49d 100644 --- a/src/gpu/text/GrAtlasTextContext.h +++ b/src/gpu/text/GrAtlasTextContext.h @@ -33,24 +33,22 @@ class GrAtlasTextContext : public GrTextContext { public: static GrAtlasTextContext* Create(GrContext*, const SkSurfaceProps&); -private: - GrAtlasTextContext(GrContext*, const SkSurfaceProps&); - ~GrAtlasTextContext() override {} - - bool canDraw(const SkPaint&, const SkMatrix& viewMatrix) override; - - void onDrawText(GrDrawContext*, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, - SkScalar x, SkScalar y, const SkIRect& regionClipBounds) override; - void onDrawPosText(GrDrawContext*, const GrClip&, const GrPaint&, - const SkPaint&, const SkMatrix& viewMatrix, - const char text[], size_t byteLength, - const SkScalar pos[], int scalarsPerPosition, - const SkPoint& offset, const SkIRect& regionClipBounds) override; + bool canDraw(const SkPaint&, const SkMatrix& viewMatrix); + void drawText(GrDrawContext*, const GrClip&, const GrPaint&, const SkPaint&, + const SkMatrix& viewMatrix, const char text[], size_t byteLength, + SkScalar x, SkScalar y, const SkIRect& regionClipBounds) override; + void drawPosText(GrDrawContext*, const GrClip&, const GrPaint&, + const SkPaint&, const SkMatrix& viewMatrix, + const char text[], size_t byteLength, + const SkScalar pos[], int scalarsPerPosition, + const SkPoint& offset, const SkIRect& regionClipBounds) override; void drawTextBlob(GrDrawContext*, const GrClip&, const SkPaint&, const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y, SkDrawFilter*, const SkIRect& clipBounds) override; +private: + GrAtlasTextContext(GrContext*, const SkSurfaceProps&); + // sets up the descriptor on the blob and returns a detached cache. Client must attach inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd); void regenerateTextBlob(GrAtlasTextBlob* bmp, const SkPaint& skPaint, GrColor, @@ -60,7 +58,6 @@ private: inline static bool HasLCD(const SkTextBlob*); // Test methods - // TODO this is really ugly. It'd be much nicer if positioning could be moved to batch inline GrAtlasTextBlob* createDrawTextBlob(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, @@ -72,7 +69,6 @@ private: const SkPoint& offset); const GrDistanceFieldAdjustTable* dfAdjustTable() const { return fDistanceAdjustTable; } - GrBatchTextStrike* fCurrStrike; GrTextBlobCache* fCache; SkAutoTUnref<const GrDistanceFieldAdjustTable> fDistanceAdjustTable; |