From 5a66efbbab2926793a7f4dc57931253ab3046375 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 7 Mar 2018 15:13:18 -0500 Subject: Remove GrRestrictedAtlasManager Philosophically this relies on: https://skia-review.googlesource.com/c/skia/+/111807 (Revise Text & Small Path Atlas so instantiation failure is handled at flush time) Change-Id: I4fdcf1af8c5e9ffefdfb973104045f4f5d223a4e Reviewed-on: https://skia-review.googlesource.com/112702 Reviewed-by: Jim Van Verth Commit-Queue: Robert Phillips --- src/atlastext/SkAtlasTextTarget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/atlastext/SkAtlasTextTarget.cpp') diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp index 4513952781..937498b826 100644 --- a/src/atlastext/SkAtlasTextTarget.cpp +++ b/src/atlastext/SkAtlasTextTarget.cpp @@ -184,14 +184,19 @@ void GrAtlasTextOp::executeForTextTarget(SkAtlasTextTarget* target) { SkAutoGlyphCache autoGlyphCache; auto& context = target->context()->internal(); auto glyphCache = context.grContext()->contextPriv().getGlyphCache(); - auto fullAtlasManager = context.grContext()->contextPriv().getFullAtlasManager(); + auto atlasManager = context.grContext()->contextPriv().getAtlasManager(); auto resourceProvider = context.grContext()->contextPriv().resourceProvider(); + unsigned int numProxies; + if (!atlasManager->getProxies(kA8_GrMaskFormat, &numProxies)) { + return; + } + for (int i = 0; i < fGeoCount; ++i) { GrAtlasTextBlob::VertexRegenerator regenerator( resourceProvider, fGeoData[i].fBlob, fGeoData[i].fRun, fGeoData[i].fSubRun, fGeoData[i].fViewMatrix, fGeoData[i].fX, fGeoData[i].fY, fGeoData[i].fColor, - &context, glyphCache, fullAtlasManager, &autoGlyphCache); + &context, glyphCache, atlasManager, &autoGlyphCache); bool done = false; while (!done) { GrAtlasTextBlob::VertexRegenerator::Result result; -- cgit v1.2.3