diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2016-11-16 10:15:23 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 15:48:48 +0000 |
| commit | 08576e618883c3f8eb2cdf425e2f2bd7842f3f2e (patch) | |
| tree | 66c97bfea8e5e7575885ae6c78da02c1ea6f133f /src/gpu/text/GrAtlasTextBlob.h | |
| parent | d47067392848ba132d4e86ffbeebe2dcacda9534 (diff) | |
Fix error with transforming custom/large glyphs
BUG=661244
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4738
Change-Id: I9f14ca830f9de92000e751a4a99ff1eb9b01db33
Reviewed-on: https://skia-review.googlesource.com/4866
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.h')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index f24147f8fd..1bbe38ece8 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -164,7 +164,7 @@ public: GrBatchTextStrike* strike, GrGlyph* glyph, SkGlyphCache*, const SkGlyph& skGlyph, - SkScalar x, SkScalar y, SkScalar scale, bool applyVM); + SkScalar x, SkScalar y, SkScalar scale, bool treatAsBMP); static size_t GetVertexStride(GrMaskFormat maskFormat) { switch (maskFormat) { @@ -292,7 +292,7 @@ private: , fTextType(0) {} void appendLargeGlyph(GrGlyph* glyph, SkGlyphCache* cache, const SkGlyph& skGlyph, - SkScalar x, SkScalar y, SkScalar scale, bool applyVM); + SkScalar x, SkScalar y, SkScalar scale, bool treatAsBMP); inline void flushRun(GrRenderTargetContext* rtc, const GrPaint&, const GrClip&, int run, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, @@ -515,17 +515,17 @@ private: GrBatchFontCache* cache); struct BigGlyph { - BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool applyVM) + BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool treatAsBMP) : fPath(path) , fScale(scale) , fX(vx) , fY(vy) - , fApplyVM(applyVM) {} + , fTreatAsBMP(treatAsBMP) {} SkPath fPath; SkScalar fScale; SkScalar fX; SkScalar fY; - bool fApplyVM; + bool fTreatAsBMP; }; struct StrokeInfo { |