diff options
| author |  joshualitt <joshualitt@google.com> | 2015-12-28 07:14:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-28 07:14:52 -0800 |
| commit | 90e293dae4990a86cb952663ccde8fae55112d7d (patch) | |
| tree | c205b1cf7dc5f0579bf93c382f97df909b57a26e /src/gpu/text/GrTextUtils.h | |
| parent | 9a878a00ef2c2eb72628c807be5969e2d8098317 (diff) | |
Revert of Make draw* lines responsible for cache management (patchset #1 id:1 of https://codereview.chromium.org/1521613002/ )
Reason for revert:
seeing crashes on android and linux
Original issue's description:
> Make draw* lines responsible for cache management
>
> TBR=bsalomon@google.com
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/66957946c0c418e71c0f36bb2904cc38c334eba4
TBR=bsalomon@google.com,jvanverth@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1552513003
Diffstat (limited to 'src/gpu/text/GrTextUtils.h')
| -rw-r--r-- | src/gpu/text/GrTextUtils.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h index 0996f655a3..8f673afbed 100644 --- a/src/gpu/text/GrTextUtils.h +++ b/src/gpu/text/GrTextUtils.h @@ -35,14 +35,13 @@ class GrTextUtils { public: // Functions for appending BMP text to GrAtlasTextBlob static void DrawBmpText(GrAtlasTextBlob*, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, - const SkPaint&, + GrBatchFontCache*, SkGlyphCache*, const SkPaint&, GrColor, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y); static void DrawBmpPosText(GrAtlasTextBlob*, int runIndex, - GrBatchFontCache*, const SkSurfaceProps&, const SkPaint&, + GrBatchFontCache*, SkGlyphCache*, const SkPaint&, GrColor, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, |