From 2c89bc153b5228c6316b5cfa070cad3d6da169ca Mon Sep 17 00:00:00 2001 From: joshualitt Date: Thu, 11 Feb 2016 05:42:30 -0800 Subject: Move surface props off of GrTextContext BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1685653004 Review URL: https://codereview.chromium.org/1685653004 --- src/gpu/text/GrTextContext.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/gpu/text/GrTextContext.h') diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h index 3de2ae2416..90ae4f35e8 100644 --- a/src/gpu/text/GrTextContext.h +++ b/src/gpu/text/GrTextContext.h @@ -30,16 +30,19 @@ public: virtual void drawText(GrDrawContext* dc, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, + const SkMatrix& viewMatrix, + const SkSurfaceProps& props, const char text[], size_t byteLength, SkScalar x, SkScalar y, const SkIRect& clipBounds) = 0; virtual void drawPosText(GrDrawContext* dc, const GrClip&, const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, + const SkSurfaceProps& props, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset, const SkIRect& clipBounds) = 0; - virtual void drawTextBlob(GrDrawContext* dc, const GrClip&, const SkPaint&, - const SkMatrix& viewMatrix, const SkTextBlob*, + virtual void drawTextBlob(GrDrawContext* dc, const GrClip&, + const SkPaint&, const SkMatrix& viewMatrix, + const SkSurfaceProps& props, const SkTextBlob*, SkScalar x, SkScalar y, SkDrawFilter*, const SkIRect& clipBounds) = 0; @@ -47,9 +50,8 @@ public: protected: GrContext* fContext; - SkSurfaceProps fSurfaceProps; - GrTextContext(GrContext*, const SkSurfaceProps&); + GrTextContext(GrContext*); static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache); static uint32_t FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint); -- cgit v1.2.3