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/GrStencilAndCoverTextContext.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/gpu/text/GrStencilAndCoverTextContext.h') diff --git a/src/gpu/text/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h index bc00a74406..053fbd3d69 100644 --- a/src/gpu/text/GrStencilAndCoverTextContext.h +++ b/src/gpu/text/GrStencilAndCoverTextContext.h @@ -28,26 +28,28 @@ class SkSurfaceProps; */ class GrStencilAndCoverTextContext : public GrTextContext { public: - static GrStencilAndCoverTextContext* Create(GrContext*, const SkSurfaceProps&); + static GrStencilAndCoverTextContext* Create(GrContext*); void drawText(GrDrawContext* dc, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, + const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[], + size_t byteLength, SkScalar x, SkScalar y, const SkIRect& clipBounds) override; void drawPosText(GrDrawContext*, const GrClip&, const GrPaint&, const SkPaint&, - const SkMatrix& viewMatrix, + const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset, const SkIRect& clipBounds) override; void drawTextBlob(GrDrawContext*, const GrClip&, const SkPaint&, - const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y, + const SkMatrix& viewMatrix, const SkSurfaceProps&, const SkTextBlob*, + SkScalar x, SkScalar y, SkDrawFilter*, const SkIRect& clipBounds) override; virtual ~GrStencilAndCoverTextContext(); private: - GrStencilAndCoverTextContext(GrContext*, const SkSurfaceProps&); + GrStencilAndCoverTextContext(GrContext*); bool canDraw(const SkPaint& skPaint, const SkMatrix&) { return this->internalCanDraw(skPaint); @@ -58,6 +60,7 @@ private: void uncachedDrawTextBlob(GrDrawContext* dc, const GrClip& clip, const SkPaint& skPaint, const SkMatrix& viewMatrix, + const SkSurfaceProps&, const SkTextBlob* blob, SkScalar x, SkScalar y, SkDrawFilter* drawFilter, @@ -76,6 +79,7 @@ private: int scalarsPerPosition, const SkPoint& offset); void draw(GrContext*, GrDrawContext*, GrPipelineBuilder*, GrColor, const SkMatrix&, + const SkSurfaceProps&, SkScalar x, SkScalar y, const SkIRect& clipBounds, GrTextContext* fallbackTextContext, const SkPaint& originalSkPaint) const; -- cgit v1.2.3