diff options
| author |  joshualitt <joshualitt@google.com> | 2015-12-28 07:23:58 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-28 07:23:58 -0800 |
| commit | e76b4bb3ae03ae85119055eac44f2721578e8202 (patch) | |
| tree | dbd74fce2241f376ac2b3265e10bd9b04fdf499d /src/gpu/text/GrAtlasTextContext.h | |
| parent | 90e293dae4990a86cb952663ccde8fae55112d7d (diff) | |
Reland of Make draw* lines responsible for cache management (patchset #1 id:1 of https://codereview.chromium.org/1552513003/ )
Reason for revert:
might have been premature
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/90e293dae4990a86cb952663ccde8fae55112d7d
TBR=bsalomon@google.com,jvanverth@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1551563003
Diffstat (limited to 'src/gpu/text/GrAtlasTextContext.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextContext.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/text/GrAtlasTextContext.h b/src/gpu/text/GrAtlasTextContext.h index e38243d480..3971352e96 100644 --- a/src/gpu/text/GrAtlasTextContext.h +++ b/src/gpu/text/GrAtlasTextContext.h @@ -74,13 +74,13 @@ private: const SkPoint& offset); void internalDrawDFText(GrAtlasTextBlob*, int runIndex, - SkGlyphCache*, const SkPaint&, + const SkPaint&, GrColor color, const SkMatrix& viewMatrix, const char text[], size_t byteLength, SkScalar x, SkScalar y, SkScalar textRatio, const SkPaint& origPaint); void internalDrawDFPosText(GrAtlasTextBlob*, int runIndex, - SkGlyphCache*, const SkPaint&, + const SkPaint&, GrColor color, const SkMatrix& viewMatrix, const char text[], size_t byteLength, const SkScalar pos[], int scalarsPerPosition, @@ -90,7 +90,6 @@ private: // sets up the descriptor on the blob and returns a detached cache. Client must attach inline static GrColor ComputeCanonicalColor(const SkPaint&, bool lcd); - inline SkGlyphCache* setupCache(Run*, const SkPaint&, const SkMatrix* viewMatrix, bool noGamma); void regenerateTextBlob(GrAtlasTextBlob* bmp, const SkPaint& skPaint, GrColor, const SkMatrix& viewMatrix, const SkTextBlob* blob, SkScalar x, SkScalar y, |