diff options
author | cdalton <cdalton@nvidia.com> | 2015-03-25 14:02:37 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 14:02:37 -0700 |
commit | e68f7362b1e00e88688906de6384e4e5a83076d0 (patch) | |
tree | 5020c5280d38a5a9f3171e853bb5d3d5c72bbdd0 /src/gpu/GrBitmapTextContext.h | |
parent | 9c59ebc0db7cade1537591813430f7be47123e76 (diff) |
Add more parameters to GrTextContext::canDraw
Updates canDraw to accept all the same Skia/Gr objects as the drawText
functions, since that information may very well be relevant in
determining whether a context can draw.
Also moves the onDrawTextBlob implementation directly into
drawTextBlob.
BUG=skia:
Review URL: https://codereview.chromium.org/1010113004
Diffstat (limited to 'src/gpu/GrBitmapTextContext.h')
-rw-r--r-- | src/gpu/GrBitmapTextContext.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/gpu/GrBitmapTextContext.h b/src/gpu/GrBitmapTextContext.h index e389f81480..2c5c0e43cb 100644 --- a/src/gpu/GrBitmapTextContext.h +++ b/src/gpu/GrBitmapTextContext.h @@ -39,16 +39,17 @@ private: GrBitmapTextContext(GrContext*, SkGpuDevice*, const SkDeviceProperties&); - bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE; - - virtual void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, - SkScalar x, SkScalar y, const SkIRect& regionClipBounds) SK_OVERRIDE; - virtual void onDrawPosText(GrRenderTarget*, 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) SK_OVERRIDE; + bool canDraw(const GrRenderTarget*, const GrClip&, const GrPaint&, + const SkPaint&, const SkMatrix& viewMatrix) SK_OVERRIDE; + + void onDrawText(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, + const SkMatrix& viewMatrix, const char text[], size_t byteLength, + SkScalar x, SkScalar y, const SkIRect& regionClipBounds) SK_OVERRIDE; + void onDrawPosText(GrRenderTarget*, 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) SK_OVERRIDE; void init(GrRenderTarget*, const GrClip&, const GrPaint&, const SkPaint&, const SkIRect& regionClipBounds); |