diff options
| author |  Leon Scroggins <scroggo@google.com> | 2018-01-20 17:09:02 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-20 17:09:10 +0000 |
| commit | 2914555e004676465c5255d8b42ee0d25887ac73 (patch) | |
| tree | a93a781cd867005eb72071577064667e970c8430 /src/gpu/text/GrAtlasTextBlob.h | |
| parent | 4f7f197c09443232f02cd81f3ac7fb5a216acd05 (diff) | |
Revert "Move more internal methods from GrContext to GrContextPriv (take 2)"
This reverts commit c22e50bd317fe3658445c04e18a6e319d746c510.
Reason for revert: Speculative fix for Android roll
Original change's description:
> Move more internal methods from GrContext to GrContextPriv (take 2)
>
> Change-Id: I47108910517d61edeb52f82793d384fdb5605d45
> Reviewed-on: https://skia-review.googlesource.com/97241
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I3a77ac33c5f48529357cf9c683d5f4cacaa2379f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/97582
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 2b4047bdd6..b93632fcfe 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -195,14 +195,14 @@ public: const SkMatrix& viewMatrix, SkScalar x, SkScalar y); // flush a GrAtlasTextBlob associated with a SkTextBlob - void flushCached(GrAtlasGlyphCache*, GrTextUtils::Target*, const SkTextBlob* blob, + void flushCached(GrContext* context, GrTextUtils::Target*, const SkTextBlob* blob, const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, const GrTextUtils::Paint&, SkDrawFilter* drawFilter, const GrClip& clip, const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, SkScalar y); // flush a throwaway GrAtlasTextBlob *not* associated with an SkTextBlob - void flushThrowaway(GrAtlasGlyphCache*, GrTextUtils::Target*, const SkSurfaceProps& props, + void flushThrowaway(GrContext* context, GrTextUtils::Target*, const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, const GrTextUtils::Paint& paint, const GrClip& clip, const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, @@ -295,11 +295,11 @@ private: const GrDistanceFieldAdjustTable* distanceAdjustTable, GrAtlasGlyphCache* cache); - void flushBigGlyphs(GrTextUtils::Target*, const GrClip& clip, + void flushBigGlyphs(GrContext* context, GrTextUtils::Target*, const GrClip& clip, const SkPaint& paint, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipBounds); - void flushBigRun(GrTextUtils::Target*, const SkSurfaceProps& props, + void flushBigRun(GrContext* context, GrTextUtils::Target*, const SkSurfaceProps& props, const SkTextBlobRunIterator& it, const GrClip& clip, const GrTextUtils::Paint& paint, SkDrawFilter* drawFilter, const SkMatrix& viewMatrix, const SkIRect& clipBounds, SkScalar x, |