diff options
| author |  Herb Derby <herb@google.com> | 2018-05-24 14:39:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-24 20:41:08 +0000 |
| commit | 26cbe5130aa9839b5429b9507363ce2474091808 (patch) | |
| tree | 5d10df1e2a768bf31af6ccbd2fd636f44f7c98b6 /tests | |
| parent | 4a0ad501e4919e06bcf7a7ef4adec8f28818946b (diff) | |
Rename GrAtlasTextContext -> GrTextContext
Change-Id: I309b39425afc9b45095241eeb299096bc426afed
Reviewed-on: https://skia-review.googlesource.com/130029
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DrawOpAtlasTest.cpp | 4 | ||||
| -rw-r--r-- | tests/SkRemoteGlyphCacheTest.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp index 9388248c2f..a2e08362c9 100644 --- a/tests/DrawOpAtlasTest.cpp +++ b/tests/DrawOpAtlasTest.cpp @@ -33,7 +33,7 @@ #include "Test.h" #include "ops/GrDrawOp.h" #include "text/GrAtlasManager.h" -#include "text/GrAtlasTextContext.h" +#include "text/GrTextContext.h" #include "text/GrTextUtils.h" #include <memory> @@ -181,7 +181,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrAtlasTextOpPreparation, reporter, ctxInfo) auto gpu = context->contextPriv().getGpu(); auto resourceProvider = context->contextPriv().resourceProvider(); auto drawingManager = context->contextPriv().drawingManager(); - auto textContext = drawingManager->getAtlasTextContext(); + auto textContext = drawingManager->getTextContext(); auto rtc = context->contextPriv().makeDeferredRenderTargetContext(SkBackingFit::kApprox, 32, 32, diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp index 23e684315e..7370bdafdb 100644 --- a/tests/SkRemoteGlyphCacheTest.cpp +++ b/tests/SkRemoteGlyphCacheTest.cpp @@ -16,7 +16,7 @@ #include "Test.h" #if SK_SUPPORT_GPU -#include "text/GrAtlasTextContext.h" +#include "text/GrTextContext.h" #endif class DiscardableManager : public SkStrikeServer::DiscardableHandleManager, @@ -342,9 +342,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_DrawTextAsDFT, reporter, c matrix[SkMatrix::kMPersp0] = 0.5f; REPORTER_ASSERT(reporter, matrix.hasPerspective()); SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry); - GrAtlasTextContext::Options options; - GrAtlasTextContext::SanitizeOptions(&options); - REPORTER_ASSERT(reporter, GrAtlasTextContext::CanDrawAsDistanceFields( + GrTextContext::Options options; + GrTextContext::SanitizeOptions(&options); + REPORTER_ASSERT(reporter, GrTextContext::CanDrawAsDistanceFields( paint, matrix, surfaceProps, true, options)); // Server. |