aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/text/GrTextBlob.h
diff options
context:
space:
mode:
authorGravatar Jim Van Verth <jvanverth@google.com>2018-06-01 13:46:46 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-01 18:31:47 +0000
commit70276915db0c4ec604213c61cb69d8f0419e0e60 (patch)
treed14b0dad8c1c3745df84b88f0dcec33ebda6098b /src/gpu/text/GrTextBlob.h
parent8683037a2ea9d75d1aea8915bf8acdc9cc6f4d24 (diff)
Set bounds correctly for color emoji that need post-cache transfoms
We need to handle the bounds for transformed color emoji the same way we handle the bounds for distance field text. Without this bounds correction, the glyphs were being clipped out. Also adds a sample to test this case. Bug: 848616 Change-Id: I39dedbe2fd19331ad67978c95519f5c9d46f59fc Reviewed-on: https://skia-review.googlesource.com/131523 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/text/GrTextBlob.h')
-rw-r--r--src/gpu/text/GrTextBlob.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 49615a92ed..e34ab88ef2 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -210,7 +210,8 @@ public:
SkScalar y);
void computeSubRunBounds(SkRect* outBounds, int runIndex, int subRunIndex,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
+ const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+ bool needsGlyphTransform) {
// We don't yet position distance field text on the cpu, so we have to map the vertex bounds
// into device space.
// We handle vertex bounds differently for distance field text and bitmap text because
@@ -219,7 +220,7 @@ public:
const Run& run = fRuns[runIndex];
const Run::SubRunInfo& subRun = run.fSubRunInfo[subRunIndex];
*outBounds = subRun.vertexBounds();
- if (subRun.drawAsDistanceFields()) {
+ if (needsGlyphTransform) {
// Distance field text is positioned with the (X,Y) as part of the glyph position,
// and currently the view matrix is applied on the GPU
outBounds->offset(x - fInitialX, y - fInitialY);