From 41f4f31cd7dadd1123600c38faa8fef6bd7fb29c Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Wed, 6 Jun 2018 17:45:53 +0000 Subject: Reland "Have draw(Text|PosText|PosTextH) use a single entry on the device" This reverts commit 74b390d6b136a60f1df15ac5ecd19bd8ad5a394b. Reason for revert: reverting to add patch for valgrind Original change's description: > Revert "Have draw(Text|PosText|PosTextH) use a single entry on the device" > > This reverts commit 4225b3220ef4bf50f0d9403f812ea94d50c4ee59. > > Reason for revert: made valgrind unhappy. > > Original change's description: > > Have draw(Text|PosText|PosTextH) use a single entry on the device > > > > Handle the positioning of drawText at the canvas layer. Simplify > > the code by removing similar implementations. > > > > Change-Id: I8b711783435072f560e29fca1dd934fa2e345ed2 > > Reviewed-on: https://skia-review.googlesource.com/127131 > > Reviewed-by: Ben Wagner > > Commit-Queue: Herb Derby > > TBR=jvanverth@google.com,bungeman@google.com,herb@google.com > > Change-Id: I65c9d30ae6ecb1f87e8660e56d8f8ce5daab7551 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/132403 > Reviewed-by: Hal Canary > Commit-Queue: Hal Canary TBR=jvanverth@google.com,halcanary@google.com,bungeman@google.com,herb@google.com Change-Id: I9bbb73aac447b51eb8215ac42331759fa4c9fa45 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/132580 Reviewed-by: Herb Derby Commit-Queue: Herb Derby --- src/gpu/text/GrTextContext.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/gpu/text/GrTextContext.h') diff --git a/src/gpu/text/GrTextContext.h b/src/gpu/text/GrTextContext.h index 3dab70ba9b..7d31d84a05 100644 --- a/src/gpu/text/GrTextContext.h +++ b/src/gpu/text/GrTextContext.h @@ -44,9 +44,6 @@ public: static std::unique_ptr Make(const Options& options); - void drawText(GrContext*, GrTextUtils::Target*, const GrClip&, const SkPaint&, - const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[], - size_t byteLength, SkScalar x, SkScalar y, const SkIRect& regionClipBounds); void drawPosText(GrContext*, GrTextUtils::Target*, const GrClip&, const SkPaint&, const SkMatrix& viewMatrix, const SkSurfaceProps&, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, @@ -123,15 +120,6 @@ private: static bool HasLCD(const SkTextBlob*); - sk_sp makeDrawTextBlob(GrTextBlobCache*, GrGlyphCache*, - const GrShaderCaps&, - const GrTextUtils::Paint&, - SkScalerContextFlags scalerContextFlags, - const SkMatrix& viewMatrix, - const SkSurfaceProps&, - const char text[], size_t byteLength, - SkScalar x, SkScalar y) const; - sk_sp makeDrawPosTextBlob(GrTextBlobCache*, GrGlyphCache*, const GrShaderCaps&, const GrTextUtils::Paint&, @@ -144,23 +132,12 @@ private: const SkPoint& offset) const; // Functions for appending BMP text to GrTextBlob - static void DrawBmpText(GrTextBlob*, int runIndex, GrGlyphCache*, - const SkSurfaceProps&, const GrTextUtils::Paint& paint, - SkScalerContextFlags scalerContextFlags, const SkMatrix& viewMatrix, - const char text[], size_t byteLength, SkScalar x, SkScalar y); - static void DrawBmpPosText(GrTextBlob*, int runIndex, GrGlyphCache*, const SkSurfaceProps&, const GrTextUtils::Paint& paint, SkScalerContextFlags scalerContextFlags, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset); - static void DrawBmpTextAsPaths(GrTextBlob*, int runIndex, GrGlyphCache*, - const SkSurfaceProps&, const GrTextUtils::Paint& paint, - SkScalerContextFlags scalerContextFlags, - const SkMatrix& viewMatrix, const char text[], - size_t byteLength, SkScalar x, SkScalar y); - static void DrawBmpPosTextAsPaths(GrTextBlob*, int runIndex, GrGlyphCache*, const SkSurfaceProps&, const GrTextUtils::Paint& paint, SkScalerContextFlags scalerContextFlags, @@ -170,11 +147,6 @@ private: const SkPoint& offset); // functions for appending distance field text - void drawDFText(GrTextBlob* blob, int runIndex, GrGlyphCache*, const SkSurfaceProps&, - const GrTextUtils::Paint& paint, SkScalerContextFlags scalerContextFlags, - const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, - SkScalar y) const; - void drawDFPosText(GrTextBlob* blob, int runIndex, GrGlyphCache*, const SkSurfaceProps&, const GrTextUtils::Paint& paint, SkScalerContextFlags scalerContextFlags, -- cgit v1.2.3