| Index: src/gpu/GrAtlasTextContext.h
|
| diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h
|
| index 2d445f35d8d4a7ae413a14e19c133a57ff0e4a41..70eabd21f8766e138b1a02654c3cd87fdfe35758 100644
|
| --- a/src/gpu/GrAtlasTextContext.h
|
| +++ b/src/gpu/GrAtlasTextContext.h
|
| @@ -38,15 +38,15 @@ private:
|
|
|
| bool canDraw(const SkPaint&, const SkMatrix& viewMatrix) override;
|
|
|
| - void onDrawText(GrDrawContext*, GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&,
|
| + 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*, GrRenderTarget*, const GrClip&, const GrPaint&,
|
| + 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;
|
| - void drawTextBlob(GrDrawContext*, GrRenderTarget*, const GrClip&, const SkPaint&,
|
| + void drawTextBlob(GrDrawContext*, const GrClip&, const SkPaint&,
|
| const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y,
|
| SkDrawFilter*, const SkIRect& clipBounds) override;
|
|
|
| @@ -86,11 +86,11 @@ private:
|
| SkScalar transX, SkScalar transY, const SkIRect& clipBounds);
|
|
|
| // We have to flush SkTextBlobs differently from drawText / drawPosText
|
| - void flush(const SkTextBlob*, GrAtlasTextBlob*, GrDrawContext*, GrRenderTarget*,
|
| + void flush(const SkTextBlob*, GrAtlasTextBlob*, GrDrawContext*,
|
| const SkPaint&, const GrPaint&, SkDrawFilter*, const GrClip&,
|
| const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, SkScalar y,
|
| SkScalar transX, SkScalar transY);
|
| - void flush(GrAtlasTextBlob*, GrDrawContext*, GrRenderTarget*, const SkPaint&,
|
| + void flush(GrAtlasTextBlob*, GrDrawContext*, const SkPaint&,
|
| const GrPaint&, const GrClip&, const SkIRect& clipBounds);
|
|
|
| // A helper for drawing BitmapText in a run of distance fields
|
|
|