| Index: src/gpu/GrAtlasTextContext.h
|
| diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h
|
| index 90e401008d4ad5567f53b9030ccd0a47b035e348..32cdd146a595d16bcd9281c3e3a47419291ada6a 100644
|
| --- a/src/gpu/GrAtlasTextContext.h
|
| +++ b/src/gpu/GrAtlasTextContext.h
|
| @@ -36,8 +36,7 @@ private:
|
| GrAtlasTextContext(GrContext*, const SkSurfaceProps&);
|
| ~GrAtlasTextContext() override {}
|
|
|
| - bool canDraw(const GrRenderTarget*, const GrClip&, const GrPaint&,
|
| - const SkPaint&, const SkMatrix& viewMatrix) override;
|
| + bool canDraw(const SkPaint&, const SkMatrix& viewMatrix) override;
|
|
|
| void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| const SkMatrix& viewMatrix, const char text[], size_t byteLength,
|
| @@ -96,7 +95,7 @@ private:
|
|
|
| // A helper for drawing BitmapText in a run of distance fields
|
| inline void fallbackDrawPosText(GrAtlasTextBlob*, int runIndex,
|
| - GrRenderTarget*, const GrClip&, GrColor color,
|
| + const GrClip&, GrColor color,
|
| const SkPaint&, const SkMatrix& viewMatrix,
|
| const SkTDArray<char>& fallbackTxt,
|
| const SkTDArray<SkScalar>& fallbackPos,
|
| @@ -149,12 +148,12 @@ private:
|
|
|
| // Test methods
|
| // TODO this is really ugly. It'd be much nicer if positioning could be moved to batch
|
| - inline GrAtlasTextBlob* createDrawTextBlob(GrRenderTarget*, const GrClip&, const GrPaint&,
|
| - const SkPaint&, const SkMatrix& viewMatrix,
|
| - const char text[], size_t byteLength,
|
| - SkScalar x, SkScalar y,
|
| - const SkIRect& regionClipBounds);
|
| - inline GrAtlasTextBlob* createDrawPosTextBlob(GrRenderTarget*, const GrClip&, const GrPaint&,
|
| + inline GrAtlasTextBlob* createDrawTextBlob(GrDrawContext*, const GrClip&, const GrPaint&,
|
| + const SkPaint&, const SkMatrix& viewMatrix,
|
| + const char text[], size_t byteLength,
|
| + SkScalar x, SkScalar y,
|
| + const SkIRect& regionClipBounds);
|
| + inline GrAtlasTextBlob* createDrawPosTextBlob(GrDrawContext*, const GrClip&, const GrPaint&,
|
| const SkPaint&, const SkMatrix& viewMatrix,
|
| const char text[], size_t byteLength,
|
| const SkScalar pos[], int scalarsPerPosition,
|
|
|