diff options
Diffstat (limited to 'src/gpu/GrTextContext.h')
| -rw-r--r-- | src/gpu/GrTextContext.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/gpu/GrTextContext.h b/src/gpu/GrTextContext.h index d333c63141..581ff64837 100644 --- a/src/gpu/GrTextContext.h +++ b/src/gpu/GrTextContext.h @@ -15,7 +15,6 @@ #include "SkPostConfig.h" -class GrClip; class GrContext; class GrDrawTarget; class GrFontScaler; @@ -27,11 +26,9 @@ class GrTextContext { public: virtual ~GrTextContext(); - bool drawText(GrRenderTarget* rt, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, - SkScalar y); - bool drawPosText(GrRenderTarget* rt, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, + bool drawText(GrRenderTarget* rt, const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, + const char text[], size_t byteLength, SkScalar x, SkScalar y); + bool drawPosText(GrRenderTarget* rt, const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset); @@ -42,7 +39,7 @@ protected: SkDeviceProperties fDeviceProperties; SkAutoTUnref<GrRenderTarget> fRenderTarget; - GrClip fClip; + const GrClip* fClip; GrDrawTarget* fDrawTarget; SkIRect fClipRect; GrPaint fPaint; @@ -52,16 +49,16 @@ protected: virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) = 0; - virtual void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, + virtual void onDrawText(GrRenderTarget*, const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y) = 0; - virtual void onDrawPosText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, + virtual void onDrawPosText(GrRenderTarget*, const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset) = 0; - void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&); + void init(GrRenderTarget*, const GrPaint&, const SkPaint&); void finish() { fDrawTarget = NULL; } static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache); |