diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-12-11 11:05:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-11 11:05:43 -0800 |
| commit | 5425a9a1807b2b2eafdd5c5f4c184f7161807f66 (patch) | |
| tree | 99647dcb7fb2217ed4b367ac9a3463c0127bbea8 /src/gpu/text/GrAtlasTextContext.h | |
| parent | cad54b53667967f4328647237982087d595e123d (diff) | |
A change to cleanup some organization around df text
BUG=skia:
Review URL: https://codereview.chromium.org/1519083002
Diffstat (limited to 'src/gpu/text/GrAtlasTextContext.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextContext.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h index 47f05404de..e38243d480 100644 --- a/src/gpu/text/GrAtlasTextContext.h +++ b/src/gpu/text/GrAtlasTextContext.h @@ -66,29 +66,27 @@ private: // A helper for drawing BitmapText in a run of distance fields inline void fallbackDrawPosText(GrAtlasTextBlob*, int runIndex, - const GrClip&, GrColor color, + GrColor color, const SkPaint&, const SkMatrix& viewMatrix, const SkTDArray<char>& fallbackTxt, const SkTDArray<SkScalar>& fallbackPos, int scalarsPerPosition, const SkPoint& offset); - void internalDrawDFText(GrAtlasTextBlob*, int runIndex, const SkPaint&, + void internalDrawDFText(GrAtlasTextBlob*, int runIndex, + SkGlyphCache*, const SkPaint&, GrColor color, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y, - SkScalar textRatio, - SkTDArray<char>* fallbackTxt, - SkTDArray<SkScalar>* fallbackPos, - SkPoint* offset, const SkPaint& origPaint); - void internalDrawDFPosText(GrAtlasTextBlob*, int runIndex, const SkPaint&, + SkScalar textRatio, const SkPaint& origPaint); + void internalDrawDFPosText(GrAtlasTextBlob*, int runIndex, + SkGlyphCache*, const SkPaint&, GrColor color, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, const SkPoint& offset, SkScalar textRatio, - SkTDArray<char>* fallbackTxt, - SkTDArray<SkScalar>* fallbackPos); + const SkPaint& origPaint); // sets up the descriptor on the blob and returns a detached cache. Client must attach inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd); @@ -104,17 +102,15 @@ private: // Test methods // TODO this is really ugly. It'd be much nicer if positioning could be moved to batch - inline GrAtlasTextBlob* createDrawTextBlob(const GrClip&, const GrPaint&, + inline GrAtlasTextBlob* createDrawTextBlob(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, - SkScalar x, SkScalar y, - const SkIRect& regionClipBounds); - inline GrAtlasTextBlob* createDrawPosTextBlob(const GrClip&, const GrPaint&, + SkScalar x, SkScalar y); + inline GrAtlasTextBlob* createDrawPosTextBlob(const GrPaint&, const SkPaint&, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, - const SkPoint& offset, - const SkIRect& regionClipBounds); + const SkPoint& offset); const GrDistanceFieldAdjustTable* dfAdjustTable() const { return fDistanceAdjustTable; } GrBatchTextStrike* fCurrStrike; |