Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: src/gpu/batches/GrAtlasTextBatch.h

Issue 1684253002: start to chip away at friending of GrAtlasTextBatch/GrAtlasTextBlob (Closed) Base URL: https://skia.googlesource.com/skia.git@tc-cleanup-6-lastmember
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/gpu/batches/GrAtlasTextBatch.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrAtlasTextBatch.h
diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextBatch.h
index f4008c947189aaf8de1fe6585a60070a1fb80e89..05d6afdb5184a44eab6affd7c4eed2d68a9e1169 100644
--- a/src/gpu/batches/GrAtlasTextBatch.h
+++ b/src/gpu/batches/GrAtlasTextBatch.h
@@ -81,39 +81,9 @@ public:
void init() {
const Geometry& geo = fGeoData[0];
fBatch.fColor = geo.fColor;
- fBatch.fViewMatrix = geo.fBlob->fViewMatrix;
-
- // 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
- // the vertex bounds of bitmap text are in device space. If we are flushing multiple runs
- // from one blob then we are going to pay the price here of mapping the rect for each run.
- const Run& run = geo.fBlob->fRuns[geo.fRun];
- SkRect bounds = run.fSubRunInfo[geo.fSubRun].vertexBounds();
- if (run.fSubRunInfo[geo.fSubRun].drawAsDistanceFields()) {
- // 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
- bounds.offset(geo.fBlob->fX - geo.fBlob->fInitialX,
- geo.fBlob->fY - geo.fBlob->fInitialY);
- fBatch.fViewMatrix.mapRect(&bounds);
- this->setBounds(bounds);
- } else {
- // Bitmap text is fully positioned on the CPU, and offset by an (X,Y) translate in
- // device space.
- SkMatrix boundsMatrix = geo.fBlob->fInitialViewMatrixInverse;
-
- boundsMatrix.postTranslate(-geo.fBlob->fInitialX, -geo.fBlob->fInitialY);
-
- boundsMatrix.postTranslate(geo.fBlob->fX, geo.fBlob->fY);
-
- boundsMatrix.postConcat(geo.fBlob->fViewMatrix);
- boundsMatrix.mapRect(&bounds);
-
- // Due to floating point numerical inaccuracies, we have to round out here
- SkRect roundedOutBounds;
- bounds.roundOut(&roundedOutBounds);
- this->setBounds(roundedOutBounds);
- }
+ fBatch.fViewMatrix = geo.fBlob->viewMatrix();
+
+ geo.fBlob->computeSubRunBounds(&fBounds, geo.fRun, geo.fSubRun);
}
const char* name() const override { return "TextBatch"; }
« no previous file with comments | « no previous file | src/gpu/batches/GrAtlasTextBatch.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698